Merge pull request #12 from nats-io/move-to-java21

Move To Java 21

Author: scottf

.github/workflows/build-main.yml

@@ -17,16 +17,16 @@ jobs:
       SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
       COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
     steps:
-      - name: Setup JDK 8
-        uses: actions/setup-java@v4
-        with:
-          java-version: '8'
-          distribution: 'adopt'
       - name: Check out code
         uses: actions/checkout@v4
+      - name: Setup java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
       - name: Build and Test
         run: chmod +x gradlew && ./gradlew clean test jacocoTestReport coveralls
       - name: Verify Javadoc
         run: ./gradlew javadoc
-      - name: Verify and Publish Snapshot
+      - name: Publish Snapshot
         run: ./gradlew -i publishToSonatype

.github/workflows/build-pr.yml

@@ -11,13 +11,13 @@ jobs:
       BUILD_EVENT: ${{ github.event_name }}
       COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
     steps:
-      - name: Setup JDK 8
-        uses: actions/setup-java@v4
-        with:
-          java-version: '8'
-          distribution: 'adopt'
       - name: Check out code
         uses: actions/checkout@v4
+      - name: Setup java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
       - name: Build and Test
         run: chmod +x gradlew && ./gradlew clean test jacocoTestReport coveralls
       - name: Verify Javadoc

.github/workflows/build-release.yml

@@ -17,13 +17,13 @@ jobs:
       SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
       SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
     steps:
-      - name: Setup JDK 8
-        uses: actions/setup-java@v4
-        with:
-          java-version: '8'
-          distribution: 'adopt'
       - name: Check out code
         uses: actions/checkout@v4
+      - name: Setup java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
       - name: Build and Test
         run: chmod +x gradlew && ./gradlew clean test
       - name: Verify Javadoc

build.gradle

@@ -1,17 +1,16 @@
 import org.gradle.internal.os.OperatingSystem
 
 plugins {
-    id 'java'
     id 'java-library'
     id 'maven-publish'
     id 'jacoco'
-    id 'com.github.kt3k.coveralls' version '2.12.0'
+    id 'com.github.kt3k.coveralls' version '2.12.2'
     id "org.gradle.test-retry" version "1.1.9"
     id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
     id 'signing'
 }
 
-def jarVersion = "2.0.2"
+def jarVersion = "2.21.0.TEST.1"
 group = 'io.nats'
 
 def isMerge = System.getenv("BUILD_EVENT") == "push"
@@ -20,19 +19,24 @@ def isRelease = System.getenv("BUILD_EVENT") == "release"
 // version is the variable the build actually uses.
 version = isRelease ? jarVersion : jarVersion + "-SNAPSHOT"
 
+// Apply a specific Java toolchain to ease working on different environments.
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+    withJavadocJar()
+    withSourcesJar()
 }
 
 repositories {
     mavenCentral()
     maven { url "https://oss.sonatype.org/content/repositories/releases/" }
+    maven { url "https://repo1.maven.org/maven2/" }
 }
 
 dependencies {
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.7.0'
-    testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.12.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
+    testImplementation 'nl.jqno.equalsverifier:equalsverifier:4.0'
 }
 
 test {
@@ -45,9 +49,10 @@ test {
 }
 
 javadoc {
+    options.addBooleanOption('html5', true)
     options.overview = 'src/main/javadoc/overview.html' // relative to source root
     source = sourceSets.main.allJava
-    title = "NATS.IO Java NKeys"
+    title = "NATS.IO JNats JSON"
     classpath = sourceSets.main.runtimeClasspath
     doLast {
         if (!OperatingSystem.current().isWindows()) {
@@ -66,37 +71,6 @@ javadoc {
     }
 }
 
-task javadocJar(type: Jar) {
-    archiveClassifier.set('javadoc')
-    from javadoc
-}
-
-task sourcesJar(type: Jar) {
-    archiveClassifier.set('sources')
-    from sourceSets.main.allSource
-}
-
-jacoco {
-    toolVersion = "0.8.6"
-}
-
-jacocoTestReport {
-    reports {
-        xml.enabled = true // coveralls plugin depends on xml format report
-        html.enabled = true
-    }
-    afterEvaluate { // only report on main library not examples
-        classDirectories.setFrom(files(classDirectories.files.collect {
-            fileTree(dir: it,
-                    exclude: ['**/examples**'])
-        }))
-    }
-}
-
-artifacts {
-    archives javadocJar, sourcesJar
-}
-
 if (isMerge || isRelease) {
     nexusPublishing {
         repositories {
@@ -113,14 +87,18 @@ if (isMerge || isRelease) {
 publishing {
     publications {
         mavenJava(MavenPublication) {
+            artifactId = archivesBaseName
             from components.java
-            artifact sourcesJar
-            artifact javadocJar
+            versionMapping {
+                usage('java-api') {
+                    fromResolutionOf('runtimeClasspath')
+                }
+                usage('java-runtime') {
+                    fromResolutionResult()
+                }
+            }
             pom {
-                name = rootProject.name
-                packaging = 'jar'
-                groupId = group
-                artifactId = archivesBaseName
+                name = 'JNats Json'
                 description = 'JSON Parser built specifically for JNATS'
                 url = 'https://github.com/nats-io/nats.java.json'
                 licenses {
@@ -134,7 +112,7 @@ publishing {
                         id = "synadia"
                         name = "Synadia"
                         email = "info@synadia.com"
-                        url = "https://nats.io"
+                        url = "https://synadia.io"
                     }
                 }
                 scm {
@@ -143,6 +121,14 @@ publishing {
             }
         }
     }
+//    repositories {
+//        maven {
+//            // change URLs to point to your repos, e.g. http://my.org/repo
+//            def releasesRepoUrl = "https://ossrh-staging-api.central.sonatype.com/service/local/"
+//            def snapshotsRepoUrl = layout.buildDirectory.dir("https://central.sonatype.com/repository/maven-snapshots/")
+//            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+//        }
+//    }
 }
 
 if (isRelease) {
@@ -154,4 +140,4 @@ if (isRelease) {
         sign configurations.archives
         sign publishing.publications.mavenJava
     }
-}
+}

env.bat

@@ -0,0 +1,2 @@
+set JAVA_HOME=C:\Program Files\Java\jdk-21
+set PATH=C:\Program Files\Java\jdk-21\bin;C:\Programs\gradle-8.14\bin;%PATH%

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists