Add Java 21 test runs

ibauersachs · ibauersachs · commit cd23ca68bead · 2023-11-04T21:47:49.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,11 +18,14 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, windows-latest ]
-        java: [ '8', '11', '17' ]
+        java: [ '8', '11', '17', '21' ]
         arch: [ 'x86', 'x64' ]
         exclude:
           - os: ubuntu-latest
             arch: x86
+          - os: windows-latest
+            java: '21'
+            arch: x86
 
     name: Java ${{ matrix.java }}/${{ matrix.arch }}/${{ matrix.os }}
 
@@ -42,14 +45,14 @@ jobs:
           cache: maven
 
       - name: Build with Maven
-        if: "${{ !(matrix.arch == 'x64' && matrix.os == 'ubuntu-latest' && matrix.java == '11') || github.event.pull_request.head.repo.full_name != 'dnsjava/dnsjava' }}"
+        if: "${{ !(matrix.arch == 'x64' && matrix.os == 'ubuntu-latest' && matrix.java == '17') || github.event.pull_request.head.repo.full_name != 'dnsjava/dnsjava' }}"
         run: mvn verify -B -"Dgpg.skip"
 
       # doesn't work with PRs from forks, see
       # https://portal.productboard.com/sonarsource/1-sonarcloud/c/50-sonarcloud-analyzes-external-pull-request
       # or https://jira.sonarsource.com/browse/MMF-1371 (not public anymore)
       - name: Cache Sonar plugins
-        if: "${{ (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/') || github.event.pull_request.head.repo.full_name == 'dnsjava/dnsjava') && matrix.arch == 'x64' && matrix.os == 'ubuntu-latest' && matrix.java == '11' }}"
+        if: "${{ (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/') || github.event.pull_request.head.repo.full_name == 'dnsjava/dnsjava') && matrix.arch == 'x64' && matrix.os == 'ubuntu-latest' && matrix.java == '17' }}"
         uses: actions/cache@v3
         with:
           path: ~/.sonar/cache
@@ -58,7 +61,7 @@ jobs:
             ${{ runner.os }}-sonar
 
       - name: Build with Maven and run Sonar
-        if: "${{ (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/') || github.event.pull_request.head.repo.full_name == 'dnsjava/dnsjava') && matrix.arch == 'x64' && matrix.os == 'ubuntu-latest' && matrix.java == '11' }}"
+        if: "${{ (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/') || github.event.pull_request.head.repo.full_name == 'dnsjava/dnsjava') && matrix.arch == 'x64' && matrix.os == 'ubuntu-latest' && matrix.java == '17' }}"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/pom.xml b/pom.xml
@@ -48,6 +48,7 @@
         <target.jdk>8</target.jdk>
 
         <org.junit.version>5.10.0</org.junit.version>
+        <!-- Stay on 4.x for Java 8 compatibility. Newer versions are used for Java 11+ builds -->
         <mockito.version>4.11.0</mockito.version>
         <slf4j.version>1.7.36</slf4j.version>
         <lombok.version>1.18.30</lombok.version>
@@ -511,6 +512,16 @@
                 </resources>
             </build>
         </profile>
+        <profile>
+            <id>java-11</id>
+            <activation>
+                <jdk>[11,)</jdk>
+            </activation>
+
+            <properties>
+                <mockito.version>5.7.0</mockito.version>
+            </properties>
+        </profile>
     </profiles>
 
     <distributionManagement>
