Skip to content

Commit

Permalink
Merge pull request #2963 from hazendaz/master
Browse files Browse the repository at this point in the history
Update allowable jdks and GHA for same
  • Loading branch information
hazendaz authored Sep 25, 2023
2 parents b631b78 + 82e4837 commit 543e145
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]
java: [11, 17, 20, 21, 22]
java: [11, 17, 21, 22]
distribution: ['zulu']
fail-fast: false
max-parallel: 4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: 17
java-version: 21
distribution: zulu
- name: Analyze with SonarCloud
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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonatype.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: 17
java-version: 21
distribution: zulu
- name: Deploy to Sonatype
run: ./mvnw deploy -DskipTests -B -V --no-transfer-progress --settings ./.mvn/settings.xml -Dlicense.skip=true
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
<!-- Reproducible Builds -->
<project.build.outputTimestamp>1678513628</project.build.outputTimestamp>

<allowed.build.jdks>[11,12),[17,18),[20,21),[21,22),[22,23)</allowed.build.jdks>
<allowed.build.jdks>[11,12),[17,18),[21,22),[22,23)</allowed.build.jdks>
</properties>

<dependencies>
Expand Down

0 comments on commit 543e145

Please sign in to comment.