Merge remote-tracking branch 'origin/release/exist-6.4.0' into JB-current

Author: Nico Verwer

.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.4.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.3.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.3.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.4.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>

exist-core/src/main/java/org/exist/storage/ValueIndexFactory.java

@@ -127,6 +127,7 @@ public final static byte[] serialize(final Indexable value, final int offset) th
         return serialize(value, offset, true);
     }
 
+    // TODO(AR) switch implementation to various serialize methods in the AtomicValues (requires major version bump)
     public final static byte[] serialize(final Indexable value, final int offset, final boolean caseSensitive) throws EXistException {
         /* xs:string */
         if (Type.subTypeOf(value.getType(), Type.STRING)) {

exist-core/src/main/java/org/exist/util/ByteConversion.java

@@ -21,6 +21,8 @@
  */
 package org.exist.util;
 
+import java.nio.ByteBuffer;
+
 /**
  * A collection of static methods to write integer values from/to a
  * byte array.
@@ -64,6 +66,27 @@ public final static int byteToIntH(final byte[] data, final int start ) {
             ( ( data[start] & 0xff ) << 24 );
     }
 
+    /**
+     * Read an integer value from the specified byte buffer.
+     *
+     * This version of the method reads the highest byte first.
+     *
+     * @param buf the byte buffer to read from
+     *
+     * @return the integer
+     */
+    public final static int byteToIntH(final ByteBuffer buf) {
+        final byte b0 = buf.get();
+        final byte b1 = buf.get();
+        final byte b2 = buf.get();
+        final byte b3 = buf.get();
+
+        return (b3 & 0xff) |
+                ((b2 & 0xff) << 8) |
+                ((b1 & 0xff) << 16) |
+                ((b0 & 0xff) << 24);
+    }
+
     /**
      *  Read a long value from the specified byte array, starting at start.
      *
@@ -83,6 +106,33 @@ public final static long byteToLong( final byte[] data, final int start ) {
             ( ( (long) data[start + 7] ) & 0xffL );
     }
 
+    /**
+     *  Read a long value from the specified byte buffer.
+     *
+     * @param buf the byte buffer to read from
+     *
+     * @return the long integer
+     */
+    public final static long byteToLong(final ByteBuffer buf) {
+        final byte b0 = buf.get();
+        final byte b1 = buf.get();
+        final byte b2 = buf.get();
+        final byte b3 = buf.get();
+        final byte b4 = buf.get();
+        final byte b5 = buf.get();
+        final byte b6 = buf.get();
+        final byte b7 = buf.get();
+
+        return ((((long) b0) & 0xffL) << 56) |
+                ((((long) b1) & 0xffL) << 48) |
+                ((((long) b2) & 0xffL) << 40) |
+                ((((long) b3) & 0xffL) << 32) |
+                ((((long) b4) & 0xffL) << 24) |
+                ((((long) b5) & 0xffL) << 16) |
+                ((((long) b6) & 0xffL) << 8) |
+                (((long) b7) & 0xffL);
+    }
+
     /**
      * Read a short value from the specified byte array, starting at start.
      *
@@ -114,6 +164,21 @@ public final static short byteToShortH( final byte[] data, final int start ) {
             ( data[start + 1] & 0xff ) );
     }
 
+    /**
+     * Read a short value from the specified byte array, starting at start.
+     *
+     * This version of the method reads the highest byte first.
+     *
+     * @param buf the byte buffer to read from
+     *
+     * @return the short integer
+     */
+    public final static short byteToShortH(final ByteBuffer buf) {
+        final byte b0 = buf.get();
+        final byte b1 = buf.get();
+        return (short) (((b0 & 0xff) << 8) | (b1 & 0xff));
+    }
+
     /**
      * Write an int value to the specified byte array. The first byte is written
      * into the location specified by start.
@@ -134,7 +199,22 @@ public final static byte[] intToByte( final int v, final byte[] data, final int
     }
 
     /**
-     * Write an int value to the specified byte array. The first byte is written
+     * Write an int value to the specified byte array.
+     *
+     * This version of the method writes the highest byte first.
+     *
+     * @param v the value
+     * @param buf the byte buffer to write into
+     */
+    public final static void intToByteH(final int v, final ByteBuffer buf) {
+        buf.put((byte) ((v >>> 24) & 0xff));
+        buf.put((byte) ((v >>> 16) & 0xff));
+        buf.put((byte) ((v >>> 8) & 0xff));
+        buf.put((byte) ((v >>> 0) & 0xff));
+    }
+
+    /**
+     * Write an int value to the specified byte buffer. The first byte is written
      * into the location specified by start.
      *
      * This version of the method writes the highest byte first.
@@ -173,6 +253,22 @@ public final static byte[] longToByte( final long v, final byte[] data, final in
         return data;
     }
 
+    /**
+     * Write a long value to the specified byte buffer.
+     *
+     * @param v the value
+     * @param buf the byte buffer to write into
+     */
+    public final static void longToByte(final long v, final ByteBuffer buf) {
+        buf.put((byte) ((v >>> 56) & 0xff));
+        buf.put((byte) ((v >>> 48) & 0xff));
+        buf.put((byte) ((v >>> 40) & 0xff));
+        buf.put((byte) ((v >>> 32) & 0xff));
+        buf.put((byte) ((v >>> 24) & 0xff));
+        buf.put((byte) ((v >>> 16) & 0xff));
+        buf.put((byte) ((v >>> 8) & 0xff));
+        buf.put((byte) ((v >>> 0) & 0xff));
+    }
 
     /**
      * Write an int value to a newly allocated byte array.
@@ -228,5 +324,19 @@ public final static byte[] shortToByteH( final short v, final byte[] data, final
         data[start] = (byte) ( ( v >>> 8 ) & 0xff );
         return data;
     }
+
+    /**
+     * Write a short value to the specified byte array.
+     *
+     * This version writes the highest byte first.
+     *
+     * @param v the value
+     * @param buf the byte buffer to write into
+     */
+    public final static void shortToByteH(final short v, final ByteBuffer buf) {
+        buf.put( (byte) ((v >>> 8) & 0xff));
+        buf.put((byte) ((v >>> 0) & 0xff));
+
+    }
 }