Skip to content

Commit 4c0a075

Browse files
authored
Merge pull request #749 from kazuki43zoo/javaversion.3.x
Add java.version=17 on 3.x
2 parents 0681191 + a1c328d commit 4c0a075

File tree

5 files changed

+5
-4
lines changed

5 files changed

+5
-4
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ jobs:
4242
java-version: ${{ matrix.java }}
4343
distribution: ${{ matrix.distribution }}
4444
- name: Test with Maven
45-
run: ./mvnw test -B -D"license.skip=true" -D"enforcer.skip=true"
45+
run: ./mvnw test -B -D"license.skip=true"

.github/workflows/coveralls.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
distribution: zulu
3434
- name: Report Coverage to Coveralls for Pull Requests
3535
if: github.event_name == 'pull_request'
36-
run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -Denforcer.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER
36+
run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER
3737
env:
3838
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3939
PR_NUMBER: ${{ github.event.number }}

.github/workflows/sonar.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
java-version: 17
3737
distribution: zulu
3838
- name: Analyze with SonarCloud
39-
run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_spring -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true -Denforcer.skip=true
39+
run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_spring -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true
4040
env:
4141
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4242
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/sonatype.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
java-version: 17
3434
distribution: zulu
3535
- name: Deploy to Sonatype
36-
run: ./mvnw deploy -DskipTests -Denforcer.skip=true -B --settings ./.mvn/settings.xml -Dlicense.skip=true
36+
run: ./mvnw deploy -DskipTests -B --settings ./.mvn/settings.xml -Dlicense.skip=true
3737
env:
3838
CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
3939
CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
<gcu.product>Spring</gcu.product>
105105
<osgi.import>org.springframework.batch.*;resolution:=optional,*</osgi.import>
106106
<osgi.dynamicImport>*</osgi.dynamicImport>
107+
<java.version>17</java.version>
107108

108109
<mybatis.version>3.5.11</mybatis.version>
109110
<spring.version>6.0.1</spring.version>

0 commit comments

Comments
 (0)