Skip to content

Commit 6db3ca2

Browse files
authored
Merge pull request #868 from kazuki43zoo/gh-867
Support JDK 22 on CI
2 parents a7e4ca9 + ad1e61e commit 6db3ca2

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

.github/workflows/ci.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,25 @@ jobs:
2626
strategy:
2727
matrix:
2828
os: [ubuntu-latest, macOS-latest, windows-latest]
29-
java: [17, 21]
29+
java: [17, 21, 22]
3030
distribution: ['zulu']
3131
fail-fast: false
3232
max-parallel: 5
3333
name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
3434

3535
steps:
3636
- uses: actions/checkout@v4
37-
- name: Set up JDK
37+
- name: Set JDK from jdk.java.net
38+
uses: oracle-actions/setup-java@v1
39+
with:
40+
website: jdk.java.net
41+
release: ${{ matrix.java }}
42+
if: ${{ matrix.java != '17' }}
43+
- name: Set up older JDK
3844
uses: actions/setup-java@v3
3945
with:
4046
java-version: ${{ matrix.java }}
4147
distribution: ${{ matrix.distribution }}
48+
if: ${{ matrix.java == '17' }}
4249
- name: Test with Maven
4350
run: ./mvnw test -B -D"license.skip=true"

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@
119119
<!-- Reproducible Builds -->
120120
<project.build.outputTimestamp>1684514485</project.build.outputTimestamp>
121121

122-
<!-- TODO: Remove this after mybatis-parent 38 -->
123-
<jacoco.plugin>0.8.9</jacoco.plugin>
122+
<!-- TODO: Remove this after mybatis-parent 40 -->
123+
<jacoco.plugin>0.8.11</jacoco.plugin>
124124

125125
<!-- Set byte buddy to experimental -->
126126
<net.bytebuddy.experimental>true</net.bytebuddy.experimental>

0 commit comments

Comments
 (0)