Chore/java 21 (#1163)

* Upgrade to JDK 21

* Update docker image to 21

---------

Co-authored-by: Sam Cao <[email protected]>

Author: codepitbull

.github/workflows/check-backend.yml

@@ -29,7 +29,7 @@ jobs:
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
         with:
           distribution: 'adopt'
-          java-version: '17'
+          java-version: '21'
 
       - uses: burrunan/gradle-cache-action@663fbad34e03c8f12b27f4999ac46e3d90f87eca # v3.0.1
         name: Build container

.github/workflows/etherip-package.yml

@@ -21,7 +21,7 @@ jobs:
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
         with:
           distribution: 'adopt'
-          java-version: '17'
+          java-version: '21'
       - uses: whelk-io/maven-settings-xml-action@9dc09b23833fa9aa7f27b63db287951856f3433d # v3.0.0
         with:
           servers: >

.github/workflows/snyk-pr.yml

@@ -22,7 +22,7 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: |
-            17
+            21
 
       - uses: hivemq/hivemq-checkout-composite-action@db2d49f686c47a1eca28b7722bc3425c0d0e5101 # v1
         with:

.github/workflows/snyk-push.yml

@@ -27,7 +27,7 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: |
-            17
+            21
 
       - uses: hivemq/hivemq-checkout-composite-action@db2d49f686c47a1eca28b7722bc3425c0d0e5101 # v1
         with:

.github/workflows/snyk-release.yml

@@ -15,7 +15,7 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: |
-            17
+            21
 
       - uses: hivemq/hivemq-checkout-composite-action@db2d49f686c47a1eca28b7722bc3425c0d0e5101 # v1
         with:

build.gradle.kts

@@ -199,7 +199,7 @@ oci {
         imageName.set("hivemq/hivemq-edge")
         allPlatforms {
             dependencies {
-                runtime("library:eclipse-temurin:sha256!3aa7f6dc20dcf61b7ca765cae9a425439933bf0367923c2d9ba80bc60cfa9680") // eclipse-temurin:17.0.15_6-jre-noble
+                runtime("library:eclipse-temurin:sha256!748920dd9a6261e117da7bcaeaafa109cedd487645f7ea04135f4e3cb73ec079") // eclipse-temurin:21.0.8_9-jre-noble
             }
             config {
                 user = "10000"

edge-plugins/build.gradle.kts

@@ -6,7 +6,7 @@ group = "com.hivemq"
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 

gradle/libs.versions.toml

@@ -49,9 +49,9 @@ postgresql = "42.7.3"
 shrinkwrap = "1.2.6"
 slf4j = "2.0.17"
 spotBugs = "4.9.4"
-stefanbirkner-systemrules = "1.19.0"
 swagger-annotations = "2.2.34"
 swagger-jaxrs = "1.6.16"
+systemstubs = "2.1.8"
 victools = "4.38.0"
 wiremock = "3.0.1"
 zeroallocationhashing = "0.27ea0"
@@ -147,9 +147,9 @@ shrinkwrap-api = { module = "org.jboss.shrinkwrap:shrinkwrap-api", version.ref =
 shrinkwrap-impl = { module = "org.jboss.shrinkwrap:shrinkwrap-impl-base", version.ref = "shrinkwrap" }
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jultoslf4j = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
-stefanbirkner-systemrules = { module = "com.github.stefanbirkner:system-rules", version.ref = "stefanbirkner-systemrules" }
 swagger-annotations = { module = "io.swagger.core.v3:swagger-annotations", version.ref = "swagger-annotations" }
 swagger-jaxrs = { module = "io.swagger:swagger-jaxrs", version.ref = "swagger-jaxrs" }
+systemstubs = { module = "uk.org.webcompere:system-stubs-jupiter", version.ref = "systemstubs" }
 victools-jsonschema-generator = { module = "com.github.victools:jsonschema-generator", version.ref = "victools" }
 victools-jsonschema-jackson = { module = "com.github.victools:jsonschema-module-jackson", version.ref = "victools" }
 wiremock-jre8-standalone = { module = "com.github.tomakehurst:wiremock-jre8-standalone", version.ref = "wiremock" }

hivemq-edge/build.gradle.kts

@@ -94,7 +94,7 @@ metadata {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
     withJavadocJar()
     withSourcesJar()
@@ -226,9 +226,7 @@ dependencies {
     testImplementation(libs.javassist)
     testImplementation(libs.awaitility)
     testImplementation(libs.assertj)
-    testImplementation(libs.stefanbirkner.systemrules) {
-        exclude("junit", "junit-dep")
-    }
+    testImplementation(libs.systemstubs)
 }
 
 tasks.test {

hivemq-edge/src/main/java/com/hivemq/bootstrap/HiveMQExceptionHandlerBootstrap.java

@@ -18,28 +18,32 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
 import com.hivemq.exceptions.UnrecoverableException;
+import com.hivemq.extension.sdk.api.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicReference;
+
 /**
  * @author Dominik Obermaier
  */
 public class HiveMQExceptionHandlerBootstrap {
 
     private static final Logger log = LoggerFactory.getLogger(HiveMQExceptionHandlerBootstrap.class);
 
+    private static final AtomicReference<Runnable> terminator = new AtomicReference<>(() -> System.exit(1));
+
     /**
      * Adds an uncaught Exception Handler for UnrecoverableExceptions.
      * Logs the error and quits HiveMQ
      */
     public static void addUnrecoverableExceptionHandler() {
-        Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
-            @Override
-            public void uncaughtException(final Thread t, final Throwable e) {
+        Thread.setDefaultUncaughtExceptionHandler(HiveMQExceptionHandlerBootstrap::handleUncaughtException);
+    }
 
-                handleUncaughtException(t, e);
-            }
-        });
+    public static void setTerminator(@NotNull final Runnable runnable) {
+        terminator.set(runnable);
     }
 
     @VisibleForTesting
@@ -48,16 +52,14 @@ static void handleUncaughtException(final Thread t, final Throwable e) {
             if (((UnrecoverableException) e).isShowException()) {
                 log.error("An unrecoverable Exception occurred. Exiting HiveMQ", t, e);
             }
-            System.exit(1);
+            terminator.get().run();
         }
         final Throwable rootCause = Throwables.getRootCause(e);
         if (rootCause instanceof UnrecoverableException) {
             final boolean showException = ((UnrecoverableException) rootCause).isShowException();
             if (showException) {
                 log.error("Cause: ", e);
             }
-        } else if (rootCause instanceof ThreadDeath) {
-           // NOOP: this happens when tests stop the remaining threads via thread.stop();
         } else {
             log.error("Uncaught Error:", e);
         }