Merge pull request #18 from nats-io/revert

Revert back to Java 8 version

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: Check out code
-        uses: actions/checkout@v4
-      - name: Setup java
+      - name: Setup JDK 8
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '21'
+          java-version: '8'
+          distribution: 'adopt'
+      - name: Check out code
+        uses: actions/checkout@v4
       - name: Build and Test
         run: chmod +x gradlew && ./gradlew clean test jacocoTestReport coveralls
       - name: Verify Javadoc
         run: ./gradlew javadoc
-      - name: Publish Snapshot
+      - name: Verify and 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: Check out code
-        uses: actions/checkout@v4
-      - name: Setup java
+      - name: Setup JDK 8
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '21'
+          java-version: '8'
+          distribution: 'adopt'
+      - name: Check out code
+        uses: actions/checkout@v4
       - name: Build and Test
         run: chmod +x gradlew && ./gradlew clean test jacocoTestReport coveralls
       - name: Verify Javadoc

.github/workflows/build-release.yml

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

README.md

@@ -6,7 +6,7 @@ This library is a JSON Parser built specifically for JNATS to avoid a 3rd party
 
 It has been extracted and repackaged from the JNATS library since it is also used by the [jwt.java](https://github.com/nats-io/jwt.java) library.
 
-**Current Release**: 2.0.1   **Current Snapshot**: 2.0.2-SNAPSHOT
+**Current Release**: 2.0.1   **Current Snapshot**: 2.22.0-SNAPSHOT
 
 [![License Apache 2](https://img.shields.io/badge/License-Apache2-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.nats/jnats-json/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.nats/jnats-json)

build.gradle

@@ -7,11 +7,11 @@ plugins {
     id 'jacoco'
     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 '2.0.0'
+    id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
     id 'signing'
 }
 
-def jarVersion = "3.0.0"
+def jarVersion = "2.22.0"
 group = 'io.nats'
 
 def isMerge = System.getenv("BUILD_EVENT") == "push"
@@ -21,23 +21,18 @@ def isRelease = System.getenv("BUILD_EVENT") == "release"
 version = isRelease ? jarVersion : jarVersion + "-SNAPSHOT"
 
 java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
-    }
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 repositories {
     mavenCentral()
     maven { url "https://oss.sonatype.org/content/repositories/releases/" }
-    maven { url "https://repo1.maven.org/maven2/" }
 }
 
 dependencies {
-    implementation 'org.jetbrains:annotations:26.0.2'
-    implementation 'commons-codec:commons-codec:1.18.0'
-
     testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
-    testImplementation 'nl.jqno.equalsverifier:equalsverifier:4.0'
+    testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.12.3'
 }
 
 test {
@@ -50,7 +45,6 @@ test {
 }
 
 javadoc {
-    options.addBooleanOption('html5', true)
     options.overview = 'src/main/javadoc/overview.html' // relative to source root
     source = sourceSets.main.allJava
     title = "NATS.IO JNats JSON"
@@ -72,12 +66,12 @@ javadoc {
     }
 }
 
-tasks.register('javadocJar', Jar) {
+task javadocJar(type: Jar) {
     archiveClassifier.set('javadoc')
     from javadoc
 }
 
-tasks.register('sourcesJar', Jar) {
+task sourcesJar(type: Jar) {
     archiveClassifier.set('sources')
     from sourceSets.main.allSource
 }
@@ -88,8 +82,14 @@ jacoco {
 
 jacocoTestReport {
     reports {
-        xml.required = true // coveralls plugin depends on xml format report
-        html.required = true
+        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**'])
+        }))
     }
 }
 
@@ -151,6 +151,7 @@ if (isRelease) {
         def signingKey = System.getenv('SIGNING_KEY')
         def signingPassword = System.getenv('SIGNING_PASSWORD')
         useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
+        sign configurations.archives
         sign publishing.publications.mavenJava
     }
 }

env.bat

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