Updates workflows to Java 21

jqno · Nov 15, 2023 · dd977b4 · dd977b4
1 parent 65c54e2
commit dd977b4
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
             experimental: false
             cache-id: "jdk21"
             java: 21
-            dist: zulu
+            dist: temurin
             flags: ""
           - title: "Experimental JDK EA (simplified)"
             experimental: true

diff --git a/.github/workflows/pitest-comment.yml b/.github/workflows/pitest-comment.yml
@@ -24,11 +24,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Set up JDK 17
+      - name: Set up JDK
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
       - name: Download artifact
         uses: dawidd6/action-download-artifact@v2
         with:

diff --git a/.github/workflows/pitest.yml b/.github/workflows/pitest.yml
@@ -30,11 +30,11 @@ jobs:
           path: ~/.m2/repository
           key: ${{ runner.os }}-mvn-pitest-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-mvn-pitest
-      - name: Set up JDK 17
+      - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'temurin'
-          java-version: 17
+          distribution: temurin
+          java-version: 21
       - name: run pitest
         # pitest has been bound to a profile called pitest for normal running
         # we add config to analyse only changes made within a PR and treat surviving mutants as check errors

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,10 +18,10 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: 'Set up JDK 17'
+      - name: 'Set up JDK'
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
           cache: maven
       - name: 'Set release version'

diff --git a/pom.xml b/pom.xml
@@ -531,6 +531,20 @@
                 <jdk>[17,)</jdk>
             </activation>
 
+            <modules>
+                <module>equalsverifier-core</module>
+                <module>equalsverifier-11</module>
+                <module>equalsverifier-16</module>
+                <module>equalsverifier-17</module>
+            </modules>
+        </profile>
+
+        <profile>
+            <id>modules-jdk21</id>
+            <activation>
+                <jdk>[21,)</jdk>
+            </activation>
+
             <modules>
                 <module>equalsverifier-core</module>
                 <module>equalsverifier-11</module>
@@ -543,9 +557,9 @@
         </profile>
 
         <profile>
-            <id>modules-jdk17-without-pitest</id>
+            <id>modules-jdk21-without-pitest</id>
             <activation>
-                <jdk>[17,)</jdk>
+                <jdk>[21,)</jdk>
                 <property>
                     <name>!pitest</name>
                 </property>