Move To Java 21

scottf · scottf · commit 7de875ef5ca6 · 2025-06-03T13:55:49.000-04:00
diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
@@ -17,15 +17,16 @@ jobs:
       SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
       COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
     steps:
-      - name: Setup Maven And Java
-        uses: s4u/setup-maven-action@v1.18.0
-        with:
-          java-version: 21
       - 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
+        run: chmod +x gradlew && ./gradlew clean test jacocoTestReport coveralls
       - name: Verify Javadoc
         run: ./gradlew javadoc
       - name: Publish Snapshot
-        run: ./gradlew -i publishAllPublicationsToMavenRepository
+        run: ./gradlew -i publishToSonatype
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -13,11 +13,12 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v4
-      - name: Setup Maven Action
-        uses: s4u/setup-maven-action@v1.18.0
+      - name: Setup java
+        uses: actions/setup-java@v4
         with:
-          java-version: 21
+          distribution: 'temurin'
+          java-version: '21'
       - name: Build and Test
-        run: chmod +x gradlew && ./gradlew clean test
+        run: chmod +x gradlew && ./gradlew clean test jacocoTestReport coveralls
       - name: Verify Javadoc
         run: ./gradlew javadoc
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -17,12 +17,13 @@ jobs:
       SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
       SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
     steps:
-      - name: Setup Maven And Java
-        uses: s4u/setup-maven-action@v1.18.0
-        with:
-          java-version: 21
       - 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
diff --git a/build.gradle b/build.gradle
@@ -5,6 +5,7 @@ plugins {
     id 'maven-publish'
     id 'signing'
     id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
+    id 'jacoco'
 }
 
 def jarVersion = "2.21.0.TEST.1"
@@ -32,8 +33,8 @@ repositories {
 }
 
 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 {
@@ -128,11 +129,13 @@ publishing {
 //    }
 }
 
-signing {
-    def signingKeyId = System.getenv('SIGNING_KEY_ID')
-    def signingKey = System.getenv('SIGNING_KEY')
-    def signingPassword = System.getenv('SIGNING_PASSWORD')
-    useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
-    sign configurations.archives
-    sign publishing.publications.mavenJava
+if (isRelease) {
+    signing {
+        def signingKeyId = System.getenv('SIGNING_KEY_ID')
+        def signingKey = System.getenv('SIGNING_KEY')
+        def signingPassword = System.getenv('SIGNING_PASSWORD')
+        useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
+        sign configurations.archives
+        sign publishing.publications.mavenJava
+    }
 }
diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html
@@ -16,7 +16,7 @@
 <html>
 <head></head>
 <body>
-A simple JSON parser and utilities written in Java, extracted from JNATS</a>.
+A simple JSON parser and utilities written in Java, extracted from JNATS.
 <p><img src="large-logo.png" alt="nats logo"></p>
 
 <p><em>This package is implemented with Java 8 features.</em></p>
