Moving to build with Java 21

.github/workflows/branch-snapshot.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '8'
+          java-version: '21'
           distribution: 'temurin'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4

.github/workflows/build-main.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '8'
+          java-version: '21'
           distribution: 'temurin'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4

.github/workflows/build-pr.yml

@@ -16,9 +16,9 @@ jobs:
       SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
     steps:
       - name: Setup JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
-          java-version: '8'
+          java-version: '21'
           distribution: 'temurin'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
@@ -40,7 +40,7 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
       - name: Build and Test
-        run: chmod +x gradlew && ./gradlew clean test jacocoTestReport
+        run: chmod +x gradlew && ./gradlew clean test jacocoTestReport --refresh-dependencies
       - name: Verify Javadoc
         run: ./gradlew javadoc
       - name: Send coverage to Coveralls

.github/workflows/build-release.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '8'
+          java-version: '21'
           distribution: 'temurin'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4

build.gradle

@@ -5,24 +5,40 @@ plugins {
     id("java-library")
     id("maven-publish")
     id("jacoco")
-    id("biz.aQute.bnd.builder") version "5.1.2"
+//    id("biz.aQute.bnd.builder") version "5.1.2"
+    id("biz.aQute.bnd.builder") version "7.1.0"
     id("org.gradle.test-retry") version "1.6.4"
     id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
     id("signing")
 }
 
 def jarVersion = "2.24.2"
+group = 'io.nats'
 
 def isRelease = System.getenv("BUILD_EVENT") == "release"
 def brn = System.getenv("BRANCH_REF_NAME")
 def snap = brn == null || brn.equals("") ? "-SNAPSHOT" : "." + brn + "-SNAPSHOT"
 
-group = 'io.nats'
+def tc = System.getenv("TARGET_COMPATIBILITY");
+def targetCompat = tc == "21" ? JavaVersion.VERSION_21 : (tc == "17" ? JavaVersion.VERSION_17 : JavaVersion.VERSION_1_8)
+def jarEnd =       tc == "21" ?  "-jdk21"              : (tc == "17" ? "-jdk17"               : "")
+def jarAndArtifactName = "jnats" + jarEnd
+
 version = isRelease ? jarVersion : jarVersion + snap // version is the variable the build actually uses.
 
+def os = System.getProperty("os.name")
+def isNotWindows = !os.contains("Windows")
+def javaVersion = System.getProperty("java.version");
+def compilerIsJava8 = javaVersion.startsWith("1.8")
+
+System.out.println("OS: " + os)
+System.out.println("Java: " + javaVersion)
+System.out.println("Target Compatibility: " + targetCompat)
+System.out.println("Output: " + group + ":" + jarAndArtifactName + ":" + version)
+
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = targetCompat
 }
 
 repositories {
@@ -37,8 +53,13 @@ dependencies {
     implementation 'org.jspecify:jspecify:1.0.0'
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.14.1'
-    testImplementation 'io.nats:jnats-server-runner:3.0.1'
-    testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.12.3'
+    testImplementation 'io.nats:jnats-server-runner:3.0.2-SNAPSHOT'
+    if (compilerIsJava8) {
+        testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.12.3'
+    }
+    else {
+        testImplementation 'nl.jqno.equalsverifier:equalsverifier:4.2.2'
+    }
 
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
@@ -72,6 +93,7 @@ jar {
                 "Bundle-DocURL": "https://github.com/nats-io/nats.java"
         )
     }
+    archiveBaseName = jarAndArtifactName
 }
 
 test {
@@ -87,7 +109,13 @@ test {
         maxFailures = 4
         maxRetries = 4
     }
-    maxParallelForks = Runtime.runtime.availableProcessors()
+    int mpf = Math.max(1, (int)(Runtime.runtime.availableProcessors() * 3 / 4))
+    if (compilerIsJava8 || isNotWindows) {
+        maxParallelForks = Math.min(6, mpf)
+    }
+    else {
+        maxParallelForks = Math.min(3, mpf);
+    }
     systemProperty 'junit.jupiter.execution.timeout.default', '3m'
 }
 
@@ -198,10 +226,10 @@ publishing {
             artifact javadocJar
             artifact testsJar
             pom {
-                name = "jnats"
+                name = jarAndArtifactName
                 packaging = "jar"
                 groupId = group
-                artifactId = "jnats"
+                artifactId = jarAndArtifactName
                 description = 'Client library for working with the NATS messaging system.'
                 url = 'https://github.com/nats-io/nats.java'
                 licenses {

gradle/libs.versions.toml

@@ -0,0 +1,12 @@
+# This file was generated by the Gradle 'init' task.
+# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
+
+[versions]
+commons-math3 = "3.6.1"
+guava = "33.4.5-jre"
+junit-jupiter = "5.12.1"
+
+[libraries]
+commons-math3 = { module = "org.apache.commons:commons-math3", version.ref = "commons-math3" }
+guava = { module = "com.google.guava:guava", version.ref = "guava" }
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }

settings.gradle

@@ -1,8 +1,13 @@
 pluginManagement {
     repositories {
+        gradlePluginPortal()
         mavenCentral()
-        maven { url "https://oss.sonatype.org/content/repositories/releases/" }
-        maven { url "https://plugins.gradle.org/m2/" }
+        maven { url="https://repo1.maven.org/maven2/" }
+        maven { url="https://central.sonatype.com/repository/maven-snapshots/" }
+        maven { url="https://plugins.gradle.org/m2/" }
+    }
+    plugins {
+        id("biz.aQute.bnd.builder") version "7.1.0"
     }
 }
 rootProject.name = 'java-nats'