Upgrade to Java 25

.sdkmanrc

@@ -1,4 +1,4 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=21.0.8-tem
+java=25-tem
 

build.gradle

@@ -58,7 +58,7 @@ plugins {
 
 apply plugin: 'de.undercouch.download'
 
-ext.javaLanguageVersion = 21
+ext.javaLanguageVersion = 25
 // Adoptium also covers Temurin
 ext.javaVendor = JvmVendorSpec.ADOPTIUM
 

container_build/docker_java/Dockerfile

@@ -18,7 +18,7 @@
 # It also contains plantuml for plant uml image generation
 # Using 'openjdk' on Alpine is not fully supported so using Eclipse Temurin JDK to ensure we have a known jdk version
 # See https://github.com/docker-library/docs/blob/master/openjdk/README.md#openjdkversion-alpine
-FROM eclipse-temurin:21.0.7_6-jdk-alpine
+FROM eclipse-temurin:25_36-jdk-alpine-3.22
 
 # Work from the shared git repo dir
 WORKDIR /builder/shared

gradle/gradle-daemon-jvm.properties

@@ -1,2 +1,2 @@
 #This file is generated by updateDaemonJvm
-toolchainVersion=21
+toolchainVersion=25

gradle/libs.versions.toml

@@ -48,7 +48,7 @@ commons-io = { module = "commons-io:commons-io", version.ref = "commons-io" }
 commons-lang = { module = "org.apache.commons:commons-lang3" } # version controlled by dropwizard-dependencies
 commons-pool2 = { module = "org.apache.commons:commons-pool2", version = "2.12.1" }
 commons-text = { module = "org.apache.commons:commons-text" } # version controlled by dropwizard-dependencies
-classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.179" }
+classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.181" }
 data-faker = { module = "net.datafaker:datafaker", version = "2.4.2" }
 dropwizard-assets = { module = "io.dropwizard:dropwizard-assets" } # version controlled by dropwizard-dependencies
 dropwizard-auth = { module = "io.dropwizard:dropwizard-auth" } # version controlled by dropwizard-dependencies

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -205,15 +203,14 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

stroom-app/docker/Dockerfile

@@ -23,7 +23,7 @@
 # jstat/jmap/jcmd/etc.
 # Using 'openjdk' on Alpine is not fully supported so using Eclipse Temurin JDK to ensure we have a known jdk version
 # See https://github.com/docker-library/docs/blob/master/openjdk/README.md#openjdkversion-alpine
-FROM eclipse-temurin:21.0.8_9-jdk-alpine as stroom-base-stage
+FROM eclipse-temurin:25_36-jdk-alpine-3.22 as stroom-base-stage
 
 # bash and jq are required for Kubernetes lifecycle scripts, which interact with the API
 # curl is required for the docker healthcheck

stroom-aws/stroom-aws-s3-impl/build.gradle

@@ -33,3 +33,7 @@ dependencies {
     testImplementation libs.bundles.common.test.implementation
     testRuntimeOnly libs.bundles.common.test.runtime
 }
+
+tasks.withType(AbstractTestTask).configureEach {
+    failOnNoDiscoveredTests = false
+}

stroom-bytebuffer/build.gradle

@@ -1,7 +1,6 @@
 ext.moduleName = 'stroom.bytebuffer'
 
 dependencies {
-    implementation project(':stroom-hadoop')
     implementation project(':stroom-util')
     implementation project(':stroom-util-shared')
 //

stroom-bytebuffer/src/main/java/stroom/bytebuffer/ByteBufferUtils.java

@@ -200,30 +200,6 @@ public static String byteBufferInfo(final ByteBuffer byteBuffer) {
                 StandardCharsets.UTF_8.decode(byteBuffer.duplicate()));
     }
 
-//    public static String byteBufferToAllForms(final ByteBuffer byteBuffer) {
-//        if (byteBuffer == null) {
-//            return "null";
-//        }
-//        return ByteArrayUtils.byteArrayToAllForms(toBytes(byteBuffer));
-//    }
-//
-//    public static int compare(final ByteBuffer left, final ByteBuffer right) {
-//        int cmpResult = stroom.bytebuffer.hbase.ByteBufferUtils.compareTo(
-//                left, left.position(), left.remaining(),
-//                right, right.position(), right.remaining());
-//
-//        LOGGER.trace(() -> LogUtil.message("compare({}, {}) returned {}",
-//                ByteBufferUtils.byteBufferInfo(left),
-//                ByteBufferUtils.byteBufferInfo(right),
-//                cmpResult));
-//        return cmpResult;
-//
-//    }
-
-    public static int compareTo(final ByteBuffer buf1, final int o1, final int l1, final ByteBuffer buf2, final int o2, final int l2) {
-        return stroom.bytebuffer.hbase.ByteBufferUtils.compareTo(buf1, o1, l1, buf2, o2, l2);
-    }
-
     /**
      * Compare two {@link ByteBuffer} objects as if they are longs
      *
@@ -477,4 +453,31 @@ public static void padMax(final ByteBuffer byteBuffer, final int offset, final i
             byteBuffer.put(i, MAX_BYTE_UNSIGNED);
         }
     }
+
+    /**
+     * Check for byte buffer equality over portions of two buffers. This is generally quicker than slicing as no object
+     * creation is required.
+     *
+     * @param a      Byte buffer 1.
+     * @param aOff   Byte buffer 1 offset.
+     * @param b      Byte buffer 2.
+     * @param bOff   Byte buffer 2 offset.
+     * @param length Length to compare.
+     * @return True if byte buffer portions are equal.
+     */
+    public static boolean equals(final ByteBuffer a,
+                                 final int aOff,
+                                 final ByteBuffer b,
+                                 final int bOff,
+                                 final int length) {
+        if (length > 7) {
+            return a.slice(aOff, length).equals(b.slice(bOff, length));
+        }
+        for (int i = 0; i < length; i++) {
+            if (a.get(aOff + i) != b.get(bOff + i)) {
+                return false;
+            }
+        }
+        return true;
+    }
 }

stroom-bytebuffer/src/main/java/stroom/bytebuffer/PooledByteBufferOutputStream.java

@@ -125,6 +125,12 @@ public void write(final byte[] b, final int off, final int len) throws IOExcepti
         }
     }
 
+    public void writeLong(final long l) throws IOException {
+        checkWriteableState();
+        checkSizeAndGrow(Long.BYTES);
+        getCurrentPooledBuffer().getByteBuffer().putLong(l);
+    }
+
     /**
      * Writes byteBuffer into the outputStream. Respects the position/limit of byteBuffer.
      * After reading, byteBuffer is rewound to return it to its passed state.