Updated Jakarta-fixes with latest trunk

.asf.yaml

@@ -0,0 +1,31 @@
+# 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.
+
+# https://cwiki.apache.org/confluence/x/7guYBw
+github:
+  description: "Apache Jackrabbit"
+  homepage: "https://jackrabbit.apache.org/"
+  labels:
+    - java
+    - jackrabbit
+    - jcr
+    - repository
+    - database
+  autolink_jira:
+    - OAK
+    - JCR
+    - JCRVLT
+    - SLING
+    - FELIX

README.txt

@@ -19,7 +19,7 @@ You can build Jackrabbit like this:
 
     mvn clean install
 
-You need Maven 3 (or higher) with Java 8 (or higher) for the
+You need Maven 3 (or higher) with Java 11 (or higher) for the
 build. For more instructions, please see the documentation at:
 
    http://jackrabbit.apache.org/building-jackrabbit.html
@@ -56,21 +56,9 @@ Jackrabbit mailing lists as well as links to list archives, please see:
 Latest development
 ==================
 
-The latest Jackrabbit source code is available via Subversion at
+The latest Jackrabbit source code is available at
 
-   https://svn.apache.org/repos/asf/jackrabbit/trunk/
-
-or with ViewVC at
-
-   https://svn.apache.org/viewvc/jackrabbit/trunk/
-
-To checkout the main Jackrabbit source tree, run
-
-   svn checkout https://svn.apache.org/repos/asf/jackrabbit/trunk jackrabbit
-
-If you use Git, you can clone Jackrabbit with
-
-   git clone git://git.apache.org/jackrabbit.git
+   https://github.com/apache/jackrabbit
 
 Credits
 =======

RELEASE-NOTES.txt

@@ -1,45 +1,44 @@
-Release Notes -- Apache Jackrabbit -- Version 2.21.15
+Release Notes -- Apache Jackrabbit -- Version 2.21.27-beta
 
 Introduction
 ------------
 
-This is Apache Jackrabbit(TM) 2.21.15, a fully compliant implementation of the
+This is Apache Jackrabbit(TM) 2.21.27-beta, 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.21.15 is an unstable release cut directly from
+Apache Jackrabbit 2.21.27-beta 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.20.x
 release.
 
-Changes in Jackrabbit 2.21.15
------------------------------
+Changes in Jackrabbit 2.21.27-beta
+----------------------------------
 
 Task
 
-    [JCR-4878] - Javadoc fixes
-    [JCR-4879] - update checkstyle-plugin dependency to 3.2.0
-    [JCR-4880] - Update javadoc-plugin dependency to 3.4.1
-    [JCR-4881] - Update maven-jar-plugin to 3.3.0
-    [JCR-4882] - Update animal-sniffer plugin dependency to 1.22
-    [JCR-4883] - Update pmd-plugin dependency to 3.19.0
-    [JCR-4884] - Update spotbugs-maven-plugin to 4.7.3.0
-    [JCR-4885] - update Apache parent pom to version 28
-    [JCR-4886] - Update Jackrabbit trunk to Oak 1.46.0
-    [JCR-4888] - update Apache parent pom to version 29
-    [JCR-4889] - Update javacc-maven-plugin to version 3.0.1
-    [JCR-4891] - set baseline comparisonVersion to latest stable (2.20.8)
-    [JCR-4893] - Update mockito dependency to 4.11.0
-    [JCR-4894] - webapp: update htmlunit dependency to 2.69.0
-    [JCR-4895] - update aws java sdk version to 1.12.383
-    [JCR-4896] - Update easymock dependency to 5.1.0
-    [JCR-4897] - update kotlin-stdlib dependency to 1.8.0
-    [JCR-4898] - Update oak-jackrabbit-api.version.used in trunk and 2.20 to Oak 1.22.14
-    [JCR-4899] - Update tomcat dependency to 8.5.85
-    [JCR-4900] - Update oak-jackrabbit-api.version.implemented in trunk and 2.20 to Oak 1.48.0
-    [JCR-4901] - webapp: update htmlunit dependency to 2.70.0
-    [JCR-4903] - update checkstyle-plugin dependency to 3.2.1
-    [JCR-4905] - Update pmd-plugin dependency to 3.20.0
+    [JCR-4972] - Remove RMI support
+    [JCR-5028] - jackrabbit-jcr-rmi: remove
+    [JCR-5042] - jackrabbit-jcr-servlet: remove RMI support
+    [JCR-5044] - Update tomcat dependency to 9.0.87
+    [JCR-5045] - Update commons-io dependency to 2.16.0
+    [JCR-5046] - Update oak-jackrabbit-api.version.implemented in trunk to Oak 1.62.0
+    [JCR-5047] - Update to jacoco version 0.8.12
+    [JCR-5052] - Update commons-io dependency to 2.16.1
+    [JCR-5053] - Update commons-cli dependency to 1.7.0
+    [JCR-5054] - vfs-ext: update hadoop-hdfs-client dependency to 3.4.0
+    [JCR-5055] - update Apache parent pom to version 32
+    [JCR-5056] - Update maven-jar-plugin to 3.4.1
+    [JCR-5057] - Update pmd-plugin dependency to 3.22.0
+    [JCR-5058] - Update spotbugs-maven-plugin to 4.8.5.0
+    [JCR-5059] - set baseline comparisonVersion to latest stable (2.20.16)
+    [JCR-5060] - Update oak-jackrabbit-api.version.used in trunk and 2.20 to Oak 1.22.20
+    [JCR-5063] - Update build-helper-maven-plugin to version 3.6.0
+    [JCR-5064] - Update mockito dependency to 5.12.0
+    [JCR-5068] - update aws java sdk version to 1.12.730
+    [JCR-5069] - Update commons-cli dependency to 1.8.0
+    [JCR-5070] - Update tomcat dependency to 9.0.89
+    [JCR-5071] - Update oak-jackrabbit-api.version.implemented in trunk to Oak 1.64.0
 
 
 For more detailed information about all the changes in this and other
@@ -88,5 +87,3 @@ Trademarks
 Apache Jackrabbit, Jackrabbit, Apache, the Apache feather logo, and the Apache
 Jackrabbit project logo are trademarks of The Apache Software Foundation.
 
-
-

jackrabbit-aws-ext/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.jackrabbit</groupId>
         <artifactId>jackrabbit-parent</artifactId>
-        <version>2.21.16-SNAPSHOT</version>
+        <version>2.23.0-beta-SNAPSHOT</version>
         <relativePath>../jackrabbit-parent/pom.xml</relativePath>
     </parent>
     <artifactId>jackrabbit-aws-ext</artifactId>
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-s3</artifactId>
-            <version>1.12.383</version>
+            <version>1.12.730</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>

jackrabbit-core/pom.xml

@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.21.16-SNAPSHOT</version>
+    <version>2.23.0-beta-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
   <artifactId>jackrabbit-core</artifactId>
@@ -114,6 +114,8 @@ org.apache.jackrabbit.core.security.user.MembershipCachePerfTest <!-- don't run
 org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testStringLiteralInvalidName        <!-- OAK-3265 -->
 org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testPathLiteral                     <!-- OAK-3265 -->
 org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testURILiteral                      <!-- OAK-3265 -->
+org.apache.jackrabbit.core.version.ModifyNonVersionableCheckedOutTest#testNonVersionableCheckedOut <!-- JCR-5007 -->
+org.apache.jackrabbit.core.version.ModifyNonVersionableCheckedOutTest#testModifyNonVersionableNodeWithCheckedOutProperty <!-- JCR-5007 -->
               </value>
             </property>
             <property>
@@ -291,6 +293,11 @@ org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testURILiteral
       <artifactId>derby</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-tests</artifactId>
@@ -302,11 +309,6 @@ org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testURILiteral
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-beanutils</groupId>
-      <artifactId>commons-beanutils</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-benchmark</artifactId>
@@ -330,7 +332,7 @@ org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testURILiteral
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
-      <version>2.1.214</version>
+      <version>2.2.224</version>
       <scope>test</scope>
     </dependency>
     <dependency>

jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/PredicateDerefQuery.java

@@ -74,6 +74,11 @@ public class PredicateDerefQuery extends Query {
      * The scorer of the name test query
      */
     private Scorer nameTestScorer;
+
+    /**
+     *  Flag indicating if the children have already been calculated
+     */
+    private boolean childrenCalculated = false;
     /**
      * Creates a new <code>DerefQuery</code> based on a <code>context</code>
      * query.
@@ -203,6 +208,7 @@ public void normalize(float norm) {
         public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder,
                 boolean topScorer) throws IOException {
             subQueryScorer = subQuery.weight(searcher).scorer(reader, scoreDocsInOrder, false);
+            childrenCalculated = false;
             if (nameTest != null) {
                 nameTestScorer = new NameQuery(nameTest, version, nsMappings).weight(searcher).scorer(reader, scoreDocsInOrder, false);
             }
@@ -311,58 +317,62 @@ public int advance(int target) throws IOException {
          * @throws IOException
          */
         private void calculateChildren() throws IOException {
+
+            if (!childrenCalculated) {
 //                subQueryHits.clear();
 //                hits.clear();
-            subQueryScorer.score(new AbstractHitCollector() {
-                @Override
-                protected void collect(int doc, float score) {
-                    subQueryHits.set(doc);
-                }
-            });
+                subQueryScorer.score(new AbstractHitCollector() {
+                    @Override
+                    protected void collect(int doc, float score) {
+                        subQueryHits.set(doc);
+                    }
+                });
 
-            TermDocs termDocs = reader.termDocs(new Term(FieldNames.PROPERTIES_SET, refProperty));
-            String prefix = FieldNames.createNamedValue(refProperty, "");
-            while (termDocs.next()) {
-                int doc = termDocs.doc();
+                TermDocs termDocs = reader.termDocs(new Term(FieldNames.PROPERTIES_SET, refProperty));
+                String prefix = FieldNames.createNamedValue(refProperty, "");
+                while (termDocs.next()) {
+                    int doc = termDocs.doc();
 
-                String[] values = reader.document(doc).getValues(FieldNames.PROPERTIES);
-                if (values == null) {
-                    // no reference properties at all on this node
-                    continue;
-                }
-                for (int v = 0; v < values.length; v++) {
-                    if (values[v].startsWith(prefix)) {
-                        String uuid = values[v].substring(prefix.length());
-
-                        TermDocs node = reader.termDocs(TermFactory.createUUIDTerm(uuid));
-                        try {
-                            while (node.next()) {
-                                if (subQueryHits.get(node.doc())) {
-                                    hits.set(doc);
+                    String[] values = reader.document(doc).getValues(FieldNames.PROPERTIES);
+                    if (values == null) {
+                        // no reference properties at all on this node
+                        continue;
+                    }
+                    for (int v = 0; v < values.length; v++) {
+                        if (values[v].startsWith(prefix)) {
+                            String uuid = values[v].substring(prefix.length());
+
+                            TermDocs node = reader.termDocs(TermFactory.createUUIDTerm(uuid));
+                            try {
+                                while (node.next()) {
+                                    if (subQueryHits.get(node.doc())) {
+                                        hits.set(doc);
+                                    }
                                 }
+                            } finally {
+                                node.close();
                             }
-                        } finally {
-                            node.close();
                         }
                     }
                 }
-            }
 
-            // collect nameTest hits
-            final BitSet nameTestHits = new BitSet();
-            if (nameTestScorer != null) {
-                nameTestScorer.score(new AbstractHitCollector() {
-                    @Override
-                    protected void collect(int doc, float score) {
-                        nameTestHits.set(doc);
-                    }
-                });
-            }
+                // collect nameTest hits
+                final BitSet nameTestHits = new BitSet();
+                if (nameTestScorer != null) {
+                    nameTestScorer.score(new AbstractHitCollector() {
+                        @Override
+                        protected void collect(int doc, float score) {
+                            nameTestHits.set(doc);
+                        }
+                    });
+                }
 
-            // filter out the target nodes that do not match the name test
-            // if there is any name test at all.
-            if (nameTestScorer != null) {
-                hits.and(nameTestHits);
+                // filter out the target nodes that do not match the name test
+                // if there is any name test at all.
+                if (nameTestScorer != null) {
+                    hits.and(nameTestHits);
+                }
+                childrenCalculated = true;
             }
         }
     }

jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestRepository.java

@@ -17,14 +17,14 @@
 package org.apache.jackrabbit.core;
 
 import java.io.InputStream;
-import java.util.Map;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 
 import javax.jcr.Credentials;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.apache.commons.beanutils.BeanMap;
 import org.apache.jackrabbit.commons.repository.ProxyRepository;
 import org.apache.jackrabbit.commons.repository.RepositoryFactory;
 import org.apache.jackrabbit.core.config.ConfigurationException;
@@ -117,11 +117,16 @@ public static synchronized Repository getInstance() throws RepositoryException {
     private static Repository getIntegratedInstance() throws Exception {
         Class test =
             Class.forName("org.apache.jackrabbit.test.AbstractJCRTest");
-        Map helper = new BeanMap(test.getField("helper").get(null));
+        Field helperField = test.getField("helper");
+        helperField.setAccessible(true);
+        Object helper = helperField.get(null);
+        Method getRepository = helper.getClass().getMethod("getRepository");
+        Method getSuperuserCredentials = helper.getClass().getMethod("getSuperuserCredentials");
         final Repository repository =
-            (Repository) helper.get("repository");
+            (Repository) getRepository.invoke(helper);
         final Credentials superuser =
-            (Credentials) helper.get("superuserCredentials");
+            (Credentials) getSuperuserCredentials.invoke(helper);
+
         return new ProxyRepository(new RepositoryFactory() {
 
             public Repository getRepository() throws RepositoryException {

jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/SQL2IndexingAggregateTest.java

@@ -28,7 +28,7 @@
 
 import javax.jcr.Node;
 
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.input.NullInputStream;
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.jackrabbit.commons.JcrUtils;

jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/NodeCreationTest.java

@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.security.user;
 
-import org.apache.commons.collections.map.ListOrderedMap;
+import org.apache.commons.collections4.map.ListOrderedMap;
 import org.apache.jackrabbit.api.security.user.AbstractUserTest;
 import org.apache.jackrabbit.api.security.user.Authorizable;
 import org.apache.jackrabbit.api.security.user.AuthorizableExistsException;