Matrix Build For Java 21 and 25

.github/workflows/build-main.yml

@@ -7,9 +7,13 @@ on:
 
 jobs:
   build:
+    strategy:
+      matrix:
+        jdk: [ 21, 25 ]
     runs-on: ubuntu-latest
     env:
       BUILD_EVENT: ${{ github.event_name }}
+      TARGET_COMPATIBILITY: ${{ matrix.jdk }}
       OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
       OSSRH_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
       SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
@@ -19,7 +23,7 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v5
         with:
-          java-version: '21'
+          java-version: ${{ matrix.jdk }}
           distribution: 'temurin'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v5
@@ -35,5 +39,18 @@ jobs:
         uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ secrets.COVERALLS_REPO_TOKEN }}
+          parallel: true
+          flag-name: jdk-${{ matrix.jdk }}
       - name: Publish Snapshot
         run: ./gradlew -i publishToSonatype
+
+  coveralls-finish:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Coveralls Finish
+        uses: coverallsapp/github-action@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel-finished: true
+          carryforward: "jdk-21"

.github/workflows/build-pr.yml

@@ -6,14 +6,18 @@ on:
 
 jobs:
   build:
+    strategy:
+      matrix:
+        jdk: [ 21, 25 ]
     runs-on: ubuntu-latest
     env:
       BUILD_EVENT: ${{ github.event_name }}
+      TARGET_COMPATIBILITY: ${{ matrix.jdk }}
     steps:
       - name: Setup JDK
         uses: actions/setup-java@v5
         with:
-          java-version: '21'
+          java-version: ${{ matrix.jdk }}
           distribution: 'temurin'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v5
@@ -29,3 +33,16 @@ jobs:
         uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ secrets.COVERALLS_REPO_TOKEN }}
+          parallel: true
+          flag-name: jdk-${{ matrix.jdk }}
+
+  coveralls-finish:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Coveralls Finish
+        uses: coverallsapp/github-action@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel-finished: true
+          carryforward: "jdk-21"

.github/workflows/build-release.yml

@@ -8,9 +8,13 @@ on:
 
 jobs:
   build:
+    strategy:
+      matrix:
+        jdk: [ 21, 25 ]
     runs-on: ubuntu-latest
     env:
       BUILD_EVENT: ${{ github.event_name }}
+      TARGET_COMPATIBILITY: ${{ matrix.jdk }}
       OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
       OSSRH_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
       SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
@@ -20,7 +24,7 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v5
         with:
-          java-version: '21'
+          java-version: ${{ matrix.jdk }}
           distribution: 'temurin'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v5

build.gradle

@@ -16,8 +16,10 @@ group = 'io.synadia'
 def isRelease = System.getenv("BUILD_EVENT") == "release"
 def tc = System.getenv("TARGET_COMPATIBILITY")
 def targetCompat = tc == "25" ? JavaVersion.VERSION_25 : JavaVersion.VERSION_21
-def jarEnd =       tc == "25" ?  "-jdk25"              : ""
+def jarEnd =       tc == "25" ?  "-jdk25" : ""
+def bundleEnd =    tc == "25" ?  ".jdk25" : ""
 def jarAndArtifactName = "jnats-json" + jarEnd
+def bundleName = "io.synadia.jnats.json" + bundleEnd
 
 version = isRelease ? jarVersion : jarVersion + "-SNAPSHOT" // version is the variable the build actually uses.
 
@@ -49,7 +51,7 @@ tasks.register('bundle', Bundle) {
 
 jar {
     bundle {
-        bnd("Bundle-Name": "io.synadia.jnats.json",
+        bnd("Bundle-Name": bundleName,
                 "Bundle-Vendor": "synadia.io",
                 "Bundle-Description": "JNats JSON Utility",
                 "Bundle-DocURL": "https://github.com/synadia-io/jnats.json",