Java 25

build.gradle

@@ -1 +1 @@
-version = "0.2.0"
+version = "0.3.0"

gradle/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
-java = "17"
-slf4j = "2.0.7"
-logback = "1.3.5"
-reload4j = "1.2.25"
-richtextfx = "0.11.0"
-javafx = "20"
+java = "25"
+slf4j = "2.0.17"
+logback = "1.5.20"
+reload4j = "1.2.26"
+richtextfx = "0.11.6"
+javafx = "25"
 javafxPlugin = "0.1.0"
-jlink = "2.12.0"
+jlink = "3.1.3"
 
 [libraries]
 slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }

gradle/test-libs.versions.toml

@@ -1,8 +1,9 @@
 [versions]
-junit = "5.9.3"
+junit = "6.0.0"
 
 [libraries]
 junit = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
+junit-platform = { module = "org.junit.platform:junit-platform-launcher" }
 
 [bundles]
 

gradle/wrapper/gradle-wrapper.properties

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

logviewer-api/build.gradle

@@ -16,6 +16,6 @@ dependencies {
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
+        languageVersion = JavaLanguageVersion.of(libs.versions.java.get())
     }
 }

logviewer-logging-jdk/build.gradle

@@ -11,6 +11,7 @@ repositories {
 dependencies {
     // Use JUnit Jupiter for testing.
     testImplementation testLibs.junit
+    testRuntimeOnly testLibs.junit.platform
 
     // Use JDK 1.4 Reload4j Binding.
     implementation libs.slf4j.jdk14

logviewer-logging-jdk/src/test/java/qupath/ui/logviewer/logging/jdk/TestJdkManager.java

@@ -1,5 +1,6 @@
 package qupath.ui.logviewer.logging.jdk;
 
+import org.junit.jupiter.api.Assertions;
 import qupath.ui.logviewer.api.LogMessage;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
@@ -13,12 +14,10 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.IntStream;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 public class TestJdkManager {
 
-    private static final Logger slf4jLogger = LoggerFactory.getLogger(JdkManager.class);
+    private static final Logger slf4jLogger = LoggerFactory.getLogger(TestJdkManager.class);
     private static final java.util.logging.Logger jdk14Logger = java.util.logging.Logger.getLogger("");
 
     @Test
@@ -27,7 +26,7 @@ void Check_Framework_Active() {
 
         boolean managerActive = jdkManager.isFrameworkActive();
 
-        assertTrue(managerActive);
+        Assertions.assertTrue(managerActive);
     }
 
     @Test
@@ -37,7 +36,7 @@ void Check_Root_Level_Set_To_Trace_Through_Jdk14Manager() {
 
         Level level = jdkManager.getRootLogLevel();
 
-        assertEquals(level, Level.TRACE);
+        Assertions.assertEquals(Level.TRACE, level);
     }
     @Test
     void Check_Root_Level_Set_To_Error_Through_Jdk14_Logger() {
@@ -46,94 +45,93 @@ void Check_Root_Level_Set_To_Error_Through_Jdk14_Logger() {
 
         Level level = jdkManager.getRootLogLevel();
 
-        assertEquals(level, Level.ERROR);
+        Assertions.assertEquals(Level.ERROR, level);
     }
 
     @Test
     void Check_Message_Forwarded() throws InterruptedException {
         CountDownLatch latch = new CountDownLatch(1);
         JdkManager jdkManager = new JdkManager();
-        jdkManager.addListener(logMessage -> latch.countDown());
+        jdkManager.addListener(_ -> latch.countDown());
         jdkManager.setRootLogLevel(Level.TRACE);
 
-        slf4jLogger.info("A log message");
+        slf4jLogger.info("A log message 1");
 
-        assertTrue(latch.await(100, TimeUnit.MILLISECONDS));
+        Assertions.assertTrue(latch.await(100, TimeUnit.MILLISECONDS));
     }
 
     @Test
     void Check_Message_Not_Forwarded() throws InterruptedException {
         CountDownLatch latch = new CountDownLatch(1);
         JdkManager jdkManager = new JdkManager();
-        LoggerListener loggerListener = logMessage -> latch.countDown();
+        LoggerListener loggerListener = _ -> latch.countDown();
         jdkManager.addListener(loggerListener);
         jdkManager.setRootLogLevel(Level.TRACE);
         jdkManager.removeListener(loggerListener);
 
-        slf4jLogger.info("A log message");
+        slf4jLogger.info("A log message 2");
 
-        assertFalse(latch.await(100, TimeUnit.MILLISECONDS));
+        Assertions.assertFalse(latch.await(100, TimeUnit.MILLISECONDS));
     }
 
     @Test
     void Check_N_Message_Forwarded() throws InterruptedException {
         int N = 5;
         CountDownLatch latch = new CountDownLatch(N);
         JdkManager jdkManager = new JdkManager();
-        jdkManager.addListener(logMessage -> latch.countDown());
+        jdkManager.addListener(_ -> latch.countDown());
         jdkManager.setRootLogLevel(Level.TRACE);
 
         for (int i=0; i<N; ++i) {
-            slf4jLogger.info("A log message");
+            slf4jLogger.info("A log message 3");
         }
 
-        assertTrue(latch.await(100, TimeUnit.MILLISECONDS));
+        Assertions.assertTrue(latch.await(100, TimeUnit.MILLISECONDS));
     }
 
     @Test
     void Check_N_Message_Forwarded_From_Different_Threads() throws InterruptedException {
         int N = 5;
         CountDownLatch latch = new CountDownLatch(N);
         JdkManager jdkManager = new JdkManager();
-        jdkManager.addListener(logMessage -> latch.countDown());
+        jdkManager.addListener(_ -> latch.countDown());
         jdkManager.setRootLogLevel(Level.TRACE);
 
         IntStream.range(0, N)
                 .parallel()
-                .forEach(index -> slf4jLogger.info("A log message"));
+                .forEach(_ -> slf4jLogger.info("A log message 4"));
 
-        assertTrue(latch.await(100, TimeUnit.MILLISECONDS));
+        Assertions.assertTrue(latch.await(100, TimeUnit.MILLISECONDS));
     }
 
     @Test
     void Check_Message_Not_Forwarded_If_Level_Too_Low() throws InterruptedException {
         CountDownLatch latch = new CountDownLatch(1);
         JdkManager jdkManager = new JdkManager();
-        jdkManager.addListener(logMessage -> latch.countDown());
+        jdkManager.addListener(_ -> latch.countDown());
         jdkManager.setRootLogLevel(Level.ERROR);
 
-        slf4jLogger.info("A log message");
+        slf4jLogger.info("A log message 5");
 
-        assertFalse(latch.await(100, TimeUnit.MILLISECONDS));
+        Assertions.assertFalse(latch.await(100, TimeUnit.MILLISECONDS));
     }
 
     @Test
     void Check_Message_Information_Correct() throws InterruptedException {
         CountDownLatch latch = new CountDownLatch(1);
         JdkManager jdkManager = new JdkManager();
         LogMessage expectedLogMessage = new LogMessage(
-                "qupath.ui.logviewer.logging.jdk.JdkManager",
+                "qupath.ui.logviewer.logging.jdk.TestJdkManager",
                 0,
-                "1",        // The JDK logger does not give a thread name but a thread id
+                "",        // The JDK logger does not give a thread name but a thread id, so not predictable
                 Level.ERROR,
                 "A description",
                 new Throwable()
         );
         jdkManager.addListener(logMessage -> {
-            // Test everything except the timestamp as it cannot be precisely predicted
+            // Test everything except the timestamp and thread name as they cannot be precisely predicted
             if (
                     logMessage.loggerName().equals(expectedLogMessage.loggerName()) &&
-                    logMessage.threadName().equals(expectedLogMessage.threadName()) &&
                     logMessage.level().equals(expectedLogMessage.level()) &&
                     logMessage.message().equals(expectedLogMessage.message()) &&
                     logMessage.throwable().equals(expectedLogMessage.throwable())
@@ -149,6 +147,6 @@ void Check_Message_Information_Correct() throws InterruptedException {
                 .setCause(expectedLogMessage.throwable())
                 .log();
 
-        assertTrue(latch.await(100, TimeUnit.MILLISECONDS));
+        Assertions.assertTrue(latch.await(100, TimeUnit.MILLISECONDS));
     }
 }

logviewer-logging-logback/build.gradle

@@ -11,6 +11,7 @@ repositories {
 dependencies {
     // Use JUnit Jupiter for testing.
     testImplementation testLibs.junit
+    testRuntimeOnly testLibs.junit.platform
 
     // Use Logback as logging framework.
     implementation libs.logback