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,55 @@
-Release Notes -- Apache Jackrabbit -- Version 2.21.15
+Release Notes -- Apache Jackrabbit -- Version 2.23.1-beta
 
 Introduction
 ------------
 
-This is Apache Jackrabbit(TM) 2.21.15, a fully compliant implementation of the
+This is Apache Jackrabbit(TM) 2.23.1-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.23.1-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.23.1-beta
+----------------------------------
+
+Bug
+
+    [JCR-5107] - DbInputStream makes incorrect assumptions about commons-io internals
+
+Improvement
+
+    [JCR-5093] - jcr2spi: get rid of Commons IO dependency
+    [JCR-5106] - core tests: improve diagnostics in DBDataStoreTest
+
+Test
+
+    [JCR-5098] - jackrabbit-jcr-server: Java 24 javadoc errors
 
 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-5088] - remove warnings about missing @deprecated annotations
+    [JCR-5089] - avoid use of deprecated junit.framework.Assert
+    [JCR-5094] - webapp: bump htmlunit to 4.4.0
+    [JCR-5096] - JcrConstants: refer to the constants in javax.jcr.Property and javax.jcr.nodetype.NodeType
+    [JCR-5097] - Update oak-jackrabbit-api.version.implemented in trunk to Oak 1.68.0
+    [JCR-5099] - Update Logback version to 1.2.13
+    [JCR-5100] - Update commons-cli dependency to 1.9.0
+    [JCR-5101] - Update easymock dependency to 5.4.0
+    [JCR-5102] - Update mockito dependency to 5.14.1
+    [JCR-5103] - Update oak-jackrabbit-api.version.used to Oak 1.22.21
+    [JCR-5104] - Update oak-jackrabbit-api.version.implemented in trunk to Oak 1.70.0
+    [JCR-5105] - Update commons-io dependency to 2.17.0
+    [JCR-5108] - remove commons-collections4 version-specific dependency from jackrabbit-standalone
+    [JCR-5109] - Update tomcat dependency to 9.0.95
+    [JCR-5110] - update aws java sdk version to 1.12.773
+    [JCR-5111] - update kotlin-stdlib dependency to 1.9.25
+    [JCR-5112] - update Jetty to 9.4.56.v20240826
+    [JCR-5113] - Update pmd-plugin dependency to 3.25.0
+    [JCR-5114] - update checkstyle-plugin dependency to 3.5.0
+    [JCR-5115] - Update spotbugs-maven-plugin to 4.8.6.4
 
 
 For more detailed information about all the changes in this and other
@@ -88,5 +98,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.2-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.773</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
@@ -61,6 +61,7 @@
             <artifactId>jackrabbit-data</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</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.2-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>
@@ -355,7 +357,7 @@ org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testURILiteral
 
       Note: the ${config.db.name} database is dropped and re-created in the clean phase. 
     -->
-    <profile>
+    <!-- JCR-5148 <profile>
       <id>mysql</id>
       <properties>
         <config.db.name>jackrabbit</config.db.name>
@@ -373,7 +375,7 @@ org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testURILiteral
         <config.db.dropcommand>drop database ${config.db.name}</config.db.dropcommand>
         <config.db.createcommand>create database ${config.db.name}</config.db.createcommand>
       </properties>
-    </profile>
+    </profile> -->
     <profile>
       <id>mssql</id>
       <properties>
@@ -441,13 +443,13 @@ org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testURILiteral
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>sql-maven-plugin</artifactId>
           <dependencies>
-            <dependency>
+            <!-- JCR-5148 <dependency>
               <groupId>mysql</groupId>
               <artifactId>mysql-connector-java</artifactId>
               <version>5.1.6</version>
               <type>jar</type>
               <scope>provided</scope>
-            </dependency>
+            </dependency> -->
             <dependency>
               <groupId>net.sourceforge.jtds</groupId>
               <artifactId>jtds</artifactId>
@@ -539,13 +541,13 @@ org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testURILiteral
       </plugins>
       </build>
       <dependencies>
-        <dependency>
+        <!-- JCR-5148 <dependency>
           <groupId>mysql</groupId>
           <artifactId>mysql-connector-java</artifactId>
           <version>5.1.6</version>
           <type>jar</type>
           <scope>test</scope>
-        </dependency>
+        </dependency> -->
         <dependency>
           <groupId>net.sourceforge.jtds</groupId>
           <artifactId>jtds</artifactId>

jackrabbit-core/src/main/java/org/apache/jackrabbit/core/HierarchyManager.java

@@ -49,6 +49,7 @@ public interface HierarchyManager {
      *         if there's no item at <code>path</code>.
      * @throws RepositoryException if an error occurs
      */
+    @Deprecated
     ItemId resolvePath(Path path) throws RepositoryException;
 
     /**

jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java

@@ -467,6 +467,7 @@ private boolean canRead(ItemData parent, ItemId childId) throws RepositoryExcept
      * @param path path to the item to be checked
      * @return true if the specified item exists
      */
+    @Deprecated
     public boolean itemExists(Path path) {
         try {
             sanityCheck();
@@ -544,6 +545,7 @@ NodeImpl getRootNode() throws RepositoryException {
      * @throws AccessDeniedException
      * @throws RepositoryException
      */
+    @Deprecated
     public ItemImpl getItem(Path path) throws PathNotFoundException,
             AccessDeniedException, RepositoryException {
         ItemId id = hierMgr.resolvePath(path);

jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeImpl.java

@@ -565,6 +565,7 @@ protected synchronized NodeImpl createChildNode(Name name,
      * @throws RepositoryException
      * @deprecated use #renameChildNode(NodeId, Name, boolean)
      */
+    @Deprecated
     protected void renameChildNode(Name oldName, int index, NodeId id,
                                    Name newName)
             throws RepositoryException {
@@ -3072,6 +3073,7 @@ public boolean isLocked() throws RepositoryException {
      * @throws RepositoryException if some other error occurs
      * @deprecated
      */
+    @Deprecated
     protected void checkLock() throws LockException, RepositoryException {
         if (isNew()) {
             // a new node needs no check

jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java

@@ -22,8 +22,6 @@
 import java.io.OutputStream;
 import java.io.StringReader;
 import java.nio.charset.StandardCharsets;
-import java.security.AccessControlContext;
-import java.security.AccessController;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -80,6 +78,7 @@
 import org.apache.jackrabbit.core.gc.GarbageCollector;
 import org.apache.jackrabbit.core.id.NodeId;
 import org.apache.jackrabbit.core.id.NodeIdFactory;
+import org.apache.jackrabbit.core.jdkcompat.Java23Subject;
 import org.apache.jackrabbit.core.lock.LockManager;
 import org.apache.jackrabbit.core.lock.LockManagerImpl;
 import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
@@ -1025,8 +1024,7 @@ private Session extendAuthentication(String workspaceName)
 
         Subject subject = null;
         try {
-            AccessControlContext acc = AccessController.getContext();
-            subject = Subject.getSubject(acc);
+            subject = Java23Subject.getSubject();
         } catch (SecurityException e) {
             log.warn("Can't check for preauthentication. Reason: {}", e.getMessage());
         }

jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/LockRecord.java

@@ -166,6 +166,7 @@ public boolean isDeep() {
      * @return user id
      * @deprecated User {@link #getOwner()} instead.
      */
+    @Deprecated
     public String getUserId() {
         return lockOwner;
     }

jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java

@@ -933,6 +933,7 @@ public FileSystem getFileSystem() throws RepositoryException {
      * @return repository name
      * @deprecated Use {@link SecurityConfig#getAppName()} instead.
      */
+    @Deprecated
     public String getAppName() {
         return sec.getAppName();
     }
@@ -943,6 +944,7 @@ public String getAppName() {
      * @return access manager configuration
      * @deprecated Use {@link SecurityConfig#getAccessManagerConfig()} instead.
      */
+    @Deprecated
     public AccessManagerConfig getAccessManagerConfig() {
         return sec.getAccessManagerConfig();
     }
@@ -954,6 +956,7 @@ public AccessManagerConfig getAccessManagerConfig() {
      *         JAAS mechanism should be used.
      * @deprecated Use {@link SecurityConfig#getLoginModuleConfig()} instead.
      */
+    @Deprecated
     public LoginModuleConfig getLoginModuleConfig() {
         return sec.getLoginModuleConfig();
     }

jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java

@@ -35,6 +35,7 @@
  * for the entire lifetime of the file system instance. The configured data
  * source should be prepared for this.
  */
+@Deprecated
 public class JNDIDatabaseFileSystem extends DatabaseFileSystem {
 
     /**