ci: add JDK 25, switch to temurin distribution, refactor

Author: cortlepp

.github/workflows/ci.yml

@@ -22,13 +22,14 @@ on:
 
 env:
   MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3
-
+  BASE_JAVA_VERSION: 17
+  DEFAULT_JAVA_DISTRIBUTION: 'temurin'
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 17, 21 ]
+        java: [ 17, 21 25 ]
     name: "Java ${{ matrix.java }}"
     runs-on: ubuntu-24.04
     steps:
@@ -46,7 +47,7 @@ jobs:
       uses: actions/setup-java@v5
       with:
         java-version: ${{ matrix.java }}
-        distribution: 'zulu'
+        distribution: ${{ env.DEFAULT_JAVA_DISTRIBUTION }}
     - name: Build
       run: mvn -B -e -Papache-release -Dgpg.skip=true verify
     - name: Remove Snapshots
@@ -68,8 +69,8 @@ jobs:
     - name: Set up Java
       uses: actions/setup-java@v5
       with:
-        distribution: 'zulu'
-        java-version: 17
+        java-version: ${{ env.BASE_JAVA_VERSION }}
+        distribution: ${{ env.DEFAULT_JAVA_DISTRIBUTION }}
     - name: Build
       run: mvn -B -e -Dmaven.test.skip=true package site-deploy
     - name: Remove Snapshots
@@ -95,8 +96,8 @@ jobs:
     - name: Set up Java
       uses: actions/setup-java@v5
       with:
-        java-version: 17
-        distribution: 'zulu'
+        java-version: ${{ env.BASE_JAVA_VERSION }}
+        distribution: ${{ env.DEFAULT_JAVA_DISTRIBUTION }}
         server-id: apache.snapshots.https
         server-username: NEXUS_USER
         server-password: NEXUS_PW