Merge branch 'develop-6.x.x' into develop-6.x.x

Author: dizzzz

.github/workflows/ci-test.yml

@@ -20,7 +20,7 @@ jobs:
         timeout-minutes: 60
   dependencies:
     name: Dependency checks
-    if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/develop' }}
+    if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/develop-6.x.x' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -30,9 +30,7 @@ jobs:
           java-version: ${{ env.DEV_JDK }}
           cache: 'maven'
       - name: OWASP dependency check
-        env:
-          NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
-        run: mvn -V -B dependency-check:check
+        run: mvn -V -B dependency-check:check -DnvdApiKey=${{ secrets.NVD_API_KEY }}
         timeout-minutes: 60
   test:
     name: ${{ matrix.os }} Test
@@ -58,7 +56,7 @@ jobs:
           file-version-suffix: ''
           cache: 'true'
       - name: Maven Build
-        timeout-minutes: 10
+        timeout-minutes: 30
         run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -V -B -T 1C compile test-compile -DtrimStackTrace=false -D'dependency-check.skip' -D'license.skip'
       - name: Maven Test
         timeout-minutes: 60

exist-ant/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.exist-db</groupId>
         <artifactId>exist-parent</artifactId>
-        <version>6.3.0-SNAPSHOT</version>
+        <version>6.4.1-SNAPSHOT</version>
         <relativePath>../exist-parent</relativePath>
     </parent>
 

exist-core-jcstress/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.exist-db</groupId>
         <artifactId>exist-parent</artifactId>
-        <version>6.3.0-SNAPSHOT</version>
+        <version>6.4.1-SNAPSHOT</version>
         <relativePath>../exist-parent</relativePath>
     </parent>
 

exist-core-jmh/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.exist-db</groupId>
         <artifactId>exist-parent</artifactId>
-        <version>6.3.0-SNAPSHOT</version>
+        <version>6.4.1-SNAPSHOT</version>
         <relativePath>../exist-parent</relativePath>
     </parent>
 

exist-core/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.exist-db</groupId>
         <artifactId>exist-parent</artifactId>
-        <version>6.3.0-SNAPSHOT</version>
+        <version>6.4.1-SNAPSHOT</version>
         <relativePath>../exist-parent</relativePath>
     </parent>
 
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.15.2</version>
+            <version>2.18.3</version>
         </dependency>
 
         <!-- dependency>
@@ -114,7 +114,7 @@
         <dependency>
             <groupId>org.relaxng</groupId>
             <artifactId>jing</artifactId>
-            <version>20220510</version>
+            <version>20241231</version>
             <exclusions>
                 <exclusion> <!-- conflicts with xerces 2.12.2 dependency on xml-apis version 1.4.01 -->
                     <groupId>xml-apis</groupId>
@@ -145,7 +145,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk18on</artifactId>
-            <version>1.78.1</version>
+            <version>1.80</version>
         </dependency>
 
         <dependency>
@@ -162,7 +162,7 @@
         <dependency>
             <groupId>com.fasterxml.uuid</groupId>
             <artifactId>java-uuid-generator</artifactId>
-            <version>4.3.0</version>
+            <version>5.1.0</version>
         </dependency>
 
         <dependency>
@@ -191,7 +191,7 @@
         <dependency>
             <groupId>org.jline</groupId>
             <artifactId>jline</artifactId>
-            <version>3.25.1</version>
+            <version>3.29.0</version>
         </dependency>
 
         <dependency>
@@ -233,13 +233,13 @@
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.3.0</version>
+            <version>1.3.5</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
-            <version>2.12.0</version>
+            <version>2.12.1</version>
         </dependency>
 
         <dependency>
@@ -432,7 +432,7 @@
         <dependency>
             <groupId>com.fifesoft</groupId>
             <artifactId>rsyntaxtextarea</artifactId>
-            <version>3.3.4</version>
+            <version>3.6.0</version>
         </dependency>
 
         <dependency>