apache · andrewcollis · Feb 9, 2016 · Feb 9, 2016 · Feb 9, 2016 · Feb 9, 2016
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,41 +1,35 @@
-Release Notes -- Apache Jackrabbit -- Version 2.11.3
+Release Notes -- Apache Jackrabbit -- Version 2.12.11
 
 Introduction
 ------------
 
-This is Apache Jackrabbit(TM) 2.11.3, a fully compliant implementation of the
+This is Apache Jackrabbit(TM) 2.12.11, a fully compliant implementation of the
 Content Repository for Java(TM) Technology API, version 2.0 (JCR 2.0) as
 specified in the Java Specification Request 283 (JSR 283).
 
-Apache Jackrabbit 2.11.3 is an unstable release cut directly from
-Jackrabbit trunk, with a focus on new features and other
-improvements. For production use we recommend the latest stable 2.10.x
-release.
+Apache Jackrabbit 2.12.11 is a patch release that contains fixes and
+improvements over Jackrabbit 2.12. Jackrabbit 2.12.x releases are
+considered stable and targeted for production use.
 
-Changes in Jackrabbit 2.11.3
-----------------------------
+Note that an "end of life" date has already been planned for this branch. See
+<https://jackrabbit.apache.org/jcr/jackrabbit-roadmap.html> for details.
 
-Bug
-
-    [JCR-3934] - Error occured while loading protected handler config
-    in JcrRemotingServlet
-
-Improvement
+Changes in Jackrabbit 2.12.11
+-----------------------------
 
-    [JCR-3914] - Support default aws region
-    [JCR-3924] - Allow release-deploy to skip tests
-
-New Feature
+Bug
 
-    [JCR-3933] - Extend ValueHelper to check for valid conversion
+    [JCR-4420] - Release Notes: term "SHA1" no longer allowed
 
-In addition to the above-mentioned changes, this release contains
-all the changes included up to the Apache Jackrabbit 2.10.x release.
+Task
 
-For more detailed information about all the changes in this and other
-Jackrabbit releases, please see the Jackrabbit issue tracker at
+    [JCR-4531] - Update tomcat dependency to 8.5.51/7.0.100
+    [JCR-4547] - Update tomcat dependency to 8.5.53/7.0.103
+    [JCR-4575] - Update tomcat dependency to 8.5.55/7.0.104
+    [JCR-4612] - Update tomcat dependency to 8.5.57/7.0.105
+    [JCR-4621] - add 'javadoc' profile for Jenkins matrix builds
+    [JCR-4622] - add 'rat' profile for Jenkins matrix builds
 
-    https://issues.apache.org/jira/browse/JCR
 
 Release Contents
 ----------------
@@ -44,10 +38,10 @@ This release consists of a single source archive packaged as a zip file.
 The archive can be unpacked with the jar tool from your JDK installation.
 See the README.txt file for instructions on how to build this release.
 
-The source archive is accompanied by SHA1 and MD5 checksums and a PGP
-signature that you can use to verify the authenticity of your download.
-The public key used for the PGP signature can be found at
-https://svn.apache.org/repos/asf/jackrabbit/dist/KEYS.
+The source archive is accompanied by an SHA512 checksum and a
+PGP signature that you can use to verify the authenticity of your
+download. The public key used for the PGP signature can be found at
+https://www.apache.org/dist/jackrabbit/KEYS.
 
 About Apache Jackrabbit
 -----------------------

diff --git a/examples/jackrabbit-firsthops/pom.xml b/examples/jackrabbit-firsthops/pom.xml
@@ -60,7 +60,6 @@
   <dependency>
    <groupId>org.slf4j</groupId>
    <artifactId>slf4j-log4j12</artifactId>
-   <version>1.7.5</version>
   </dependency>
 
  </dependencies>

diff --git a/jackrabbit-api/pom.xml b/jackrabbit-api/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.11.4-SNAPSHOT</version>
+    <version>2.12.12-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
   <artifactId>jackrabbit-api</artifactId>

diff --git a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitSession.java b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitSession.java
@@ -130,7 +130,7 @@ public interface JackrabbitSession extends Session {
      * discovery:
      * <ul>
      * <li> {@link
-     * #ACTION_ADD_PROPERTY {@code add_property}: If {@code hasPermission(path,
+     * #ACTION_ADD_PROPERTY {@code add_property}}: If {@code hasPermission(path,
      * "add_property")} returns {@code true}, then this {@code Session} has
      * permission to add a new property at {@code path}.</li>
      * <li> {@link #ACTION_MODIFY_PROPERTY {@code modify_property}}: If
@@ -187,7 +187,7 @@ public interface JackrabbitSession extends Session {
      *         perform the specified actions at the specified
      *         {@code absPath}.
      * @throws RepositoryException if an error occurs.
-     * @see {@link Session#hasPermission(String, String)}
+     * @see Session#hasPermission(String, String)
      */
     public boolean hasPermission(@Nonnull String absPath, @Nonnull String... actions) throws RepositoryException;
 

diff --git a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/query/package-info.java b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/query/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* see JCR-4060 */
+@aQute.bnd.annotation.Version("2.12.6")
+package org.apache.jackrabbit.api.query;
diff --git a/...it-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlEntry.java b/...it-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlEntry.java
@@ -55,7 +55,7 @@ public interface JackrabbitAccessControlEntry extends AccessControlEntry {
      * @throws ValueFormatException If the restriction with the specified name
      * contains multiple values.
      * @throws RepositoryException if an error occurs.
-     * @see {@link #getRestrictions(String)}
+     * @see #getRestrictions(String)
      */
     Value getRestriction(String restrictionName) throws ValueFormatException, RepositoryException;
 
@@ -72,7 +72,7 @@ public interface JackrabbitAccessControlEntry extends AccessControlEntry {
      * or <code>null</code> if no such restriction exists. The array may contain
      * zero, one or multiple values.
      * @throws RepositoryException if an error occurs.
-     * @see {@link #getRestriction(String)}
+     * @see #getRestriction(String)
      */
     Value[] getRestrictions(String restrictionName) throws RepositoryException;
 }
diff --git a/...bit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlList.java b/...bit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlList.java
@@ -154,9 +154,11 @@ boolean addEntry(Principal principal, Privilege[] privileges,
     /**
      * If the <code>AccessControlList</code> implementation supports
      * reordering of entries the specified <code>srcEntry</code> is inserted
-     * at the position of the specified <code>destEntry</code>.<p/>
+     * at the position of the specified <code>destEntry</code>.
+     * <p>
      * If <code>destEntry</code> is <code>null</code> the entry is moved to the
-     * end of the list.<p/>
+     * end of the list.
+     * <p>
      * If <code>srcEntry</code> and <code>destEntry</code> are the same no
      * changes are made.
      * 

diff --git a/...-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrivilegeManager.java b/...-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrivilegeManager.java
@@ -52,7 +52,8 @@ public interface PrivilegeManager {
 
     /**
      * Creates and registers a new custom privilege with the specified
-     * characteristics and returns the new privilege.<p/>
+     * characteristics and returns the new privilege.
+     * <p>
      * If the registration succeeds, the changes are immediately effective;
      * there is no need to call <code>save</code>.
      *

diff --git a/...bbit-api/src/main/java/org/apache/jackrabbit/api/security/principal/PrincipalManager.java b/...bbit-api/src/main/java/org/apache/jackrabbit/api/security/principal/PrincipalManager.java
@@ -28,7 +28,7 @@
  * A <strong>{@link Principal}</strong> is an object used to connect
  * to any kind of security mechanism. Example for this are the
  * {@link javax.security.auth.spi.LoginModule login modules} that use principals
- * to process the login procedure. <br/>
+ * to process the login procedure. <br>
  * A principal can be a member of a <strong>{@link Group}</strong>. A
  * group is a principal itself and can therefore be a member of a group again.
  * <p>

diff --git a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Authorizable.java b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Authorizable.java
@@ -181,10 +181,12 @@ public interface Authorizable {
 
     /**
      * Returns a JCR path if this authorizable instance is associated with an
-     * item that can be accessed by the editing <code>Session</code>.<p/>
+     * item that can be accessed by the editing <code>Session</code>.
+     * <p>
      * Throws <code>UnsupportedRepositoryOperationException</code> if this
      * method is not supported or if there is no item associated with this
-     * authorizable that is accessible by the editing <code>Session</code>.<p/>
+     * authorizable that is accessible by the editing <code>Session</code>.
+     * <p>
      * Throws <code>RepositoryException</code> if another error occurs while
      * retrieving the path.
      *

diff --git a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Group.java b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Group.java
@@ -18,6 +18,8 @@
 
 import javax.annotation.Nonnull;
 import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
 import java.util.Iterator;
 import java.util.Set;
 

diff --git a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Query.java b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/Query.java
@@ -26,8 +26,8 @@
  * the name.
  *
  * <pre>
- *  Iterator<Authorizable> result = userMgr.findAuthorizables(new Query() {
- *      public <T> void build(QueryBuilder<T> builder) {
+ *  Iterator&lt;Authorizable&gt; result = userMgr.findAuthorizables(new Query() {
+ *      public &lt;T&gt; void build(QueryBuilder&lt;T&gt; builder) {
  *          builder.setCondition(builder.
  *              and(builder.
  *                  property("@name", RelationOp.EQ, valueFactory.createValue("Bob")), builder.

diff --git a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/stats/RepositoryStatistics.java b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/stats/RepositoryStatistics.java
@@ -34,7 +34,7 @@ enum Type {
         BUNDLE_WRITE_DURATION(true),
         BUNDLE_WRITE_AVERAGE(false),
         BUNDLE_CACHE_ACCESS_COUNTER(true),
-        BUNDLE_CACHE_SIZE_COUNTER(true),
+        BUNDLE_CACHE_SIZE_COUNTER(false),
         BUNDLE_CACHE_MISS_COUNTER(true),
         BUNDLE_CACHE_MISS_DURATION(true),
         BUNDLE_CACHE_MISS_AVERAGE(false),

diff --git a/jackrabbit-aws-ext/pom.xml b/jackrabbit-aws-ext/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.jackrabbit</groupId>
         <artifactId>jackrabbit-parent</artifactId>
-        <version>2.11.4-SNAPSHOT</version>
+        <version>2.12.12-SNAPSHOT</version>
         <relativePath>../jackrabbit-parent/pom.xml</relativePath>
     </parent>
     <artifactId>jackrabbit-aws-ext</artifactId>
@@ -36,6 +36,11 @@
             <groupId>javax.jcr</groupId>
             <artifactId>jcr</artifactId>
         </dependency>
+        <dependency>
+            <groupId>biz.aQute</groupId>
+            <artifactId>bndlib</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-jcr-commons</artifactId>
@@ -44,7 +49,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-s3</artifactId>
-            <version>1.10.27</version>
+            <version>1.11.330</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
@@ -70,7 +75,6 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java b/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java
@@ -113,10 +113,8 @@ public static AmazonS3Client openService(final Properties prop) {
             }
             if (DEFAULT_AWS_BUCKET_REGION.equals(region)) {
                 endpoint = S3 + DOT + AWSDOTCOM;
-            } else if (Region.EU_Ireland.toString().equals(region)) {
-                endpoint = "s3-eu-west-1" + DOT + AWSDOTCOM;
             } else {
-                endpoint = S3 + DASH + region + DOT + AWSDOTCOM;
+                endpoint = S3 + DOT + region + DOT + AWSDOTCOM;
             }
         }
         /*

diff --git a/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/package-info.java b/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* see JCR-4060 */
+@aQute.bnd.annotation.Version("2.12.6")
+package org.apache.jackrabbit.aws.ext.ds;
diff --git a/jackrabbit-bundle/pom.xml b/jackrabbit-bundle/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.11.4-SNAPSHOT</version>
+    <version>2.12.12-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
   <artifactId>jackrabbit-bundle</artifactId>
@@ -75,13 +75,13 @@
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>4.0.0</version>
+      <version>4.2.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>4.0.0</version>
+      <version>4.2.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/jackrabbit-core/pom.xml b/jackrabbit-core/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.11.4-SNAPSHOT</version>
+    <version>2.12.12-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
   <artifactId>jackrabbit-core</artifactId>
@@ -163,7 +163,6 @@ org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testURILiteral
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-jar-plugin</artifactId>
-       <version>2.4</version>
        <configuration>
           <excludes>
             <exclude>logback-test.xml</exclude>
@@ -333,14 +332,19 @@ org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testURILiteral
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+      <groupId>javax.transaction</groupId>
+      <artifactId>javax.transaction-api</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
-      <version>1.3.149</version>
+      <version>1.4.195</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>