Support JDK 22 on CI

mybatis · Oct 31, 2023 · 8191948 · 8191948
1 parent 2494630
commit 8191948
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -28,18 +28,25 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        java: [11, 17, 20, 21-ea]
+        java: [11, 17, 21, 22]
         distribution: ['zulu']
       fail-fast: false
       max-parallel: 5
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK
+      - name: Set JDK from jdk.java.net
+        uses: oracle-actions/setup-java@v1
+        with:
+          website: jdk.java.net
+          release: ${{ matrix.java }}
+        if: ${{ matrix.java != '11' && matrix.java != '17' }}
+      - name: Set up older JDK
         uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
           distribution: ${{ matrix.distribution }}
+        if: ${{ matrix.java == '11' || matrix.java == '17' }}
       - name: Test with Maven
         run: ./mvnw test -B -D"license.skip=true"
diff --git a/pom.xml b/pom.xml
@@ -112,6 +112,8 @@
 
     <junit.version>5.9.1</junit.version>
 
+    <jacoco.plugin>0.8.11</jacoco.plugin>
+
     <!-- Reproducible Builds -->
     <project.build.outputTimestamp>1684481211</project.build.outputTimestamp>
   </properties>