Skip to content

Commit 543e145

Browse files
authored
Merge pull request #2963 from hazendaz/master
Update allowable jdks and GHA for same
2 parents b631b78 + 82e4837 commit 543e145

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
matrix:
1010
os: [ubuntu-latest, macOS-latest, windows-latest]
11-
java: [11, 17, 20, 21, 22]
11+
java: [11, 17, 21, 22]
1212
distribution: ['zulu']
1313
fail-fast: false
1414
max-parallel: 4

.github/workflows/sonar.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up JDK
1818
uses: actions/setup-java@v3
1919
with:
20-
java-version: 17
20+
java-version: 21
2121
distribution: zulu
2222
- name: Analyze with SonarCloud
2323
run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_mybatis-3 -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true --no-transfer-progress

.github/workflows/sonatype.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Set up JDK
1515
uses: actions/setup-java@v3
1616
with:
17-
java-version: 17
17+
java-version: 21
1818
distribution: zulu
1919
- name: Deploy to Sonatype
2020
run: ./mvnw deploy -DskipTests -B -V --no-transfer-progress --settings ./.mvn/settings.xml -Dlicense.skip=true

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
<!-- Reproducible Builds -->
155155
<project.build.outputTimestamp>1678513628</project.build.outputTimestamp>
156156

157-
<allowed.build.jdks>[11,12),[17,18),[20,21),[21,22),[22,23)</allowed.build.jdks>
157+
<allowed.build.jdks>[11,12),[17,18),[21,22),[22,23)</allowed.build.jdks>
158158
</properties>
159159

160160
<dependencies>

0 commit comments

Comments
 (0)