Skip to content

Commit a193c03

Browse files
committed
Ignore Maven Enforcer Plugin on 3.x
See gh-715 gh-716
1 parent 7e37765 commit a193c03

File tree

6 files changed

+7
-115
lines changed

6 files changed

+7
-115
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ name: Java CI
1818

1919
on:
2020
push:
21-
branches-ignore:
22-
- 'compatibility-check-spring6'
2321
pull_request:
2422

2523
jobs:
@@ -42,4 +40,4 @@ jobs:
4240
java-version: ${{ matrix.java }}
4341
distribution: ${{ matrix.distribution }}
4442
- name: Test with Maven
45-
run: ./mvnw test -B -D"license.skip=true"
43+
run: ./mvnw test -B -D"license.skip=true" -D"enforcer.skip=true"

.github/workflows/compatibility-check-spring6.yaml

Lines changed: 0 additions & 57 deletions
This file was deleted.

.github/workflows/coveralls.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ name: Coveralls
1818

1919
on:
2020
push:
21-
branches-ignore:
22-
- 'compatibility-check-spring6'
2321
pull_request:
2422

2523
jobs:
@@ -35,12 +33,12 @@ jobs:
3533
distribution: zulu
3634
- name: Report Coverage to Coveralls for Pull Requests
3735
if: github.event_name == 'pull_request'
38-
run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER
36+
run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -Denforcer.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER
3937
env:
4038
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4139
PR_NUMBER: ${{ github.event.number }}
4240
- name: Report Coverage to Coveralls for General Push
4341
if: github.event_name == 'push'
44-
run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github
42+
run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -Denforcer.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github
4543
env:
4644
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sonar.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ name: SonarCloud
1919
on:
2020
push:
2121
branches:
22-
- master
22+
- 3.x
2323

2424
jobs:
2525
build:
@@ -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
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
4040
env:
4141
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4242
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/sonatype.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ name: Sonatype
1919
on:
2020
push:
2121
branches:
22-
- master
22+
- 3.x
2323

2424
jobs:
2525
build:
@@ -33,7 +33,7 @@ jobs:
3333
java-version: 17
3434
distribution: zulu
3535
- name: Deploy to Sonatype
36-
run: ./mvnw deploy -DskipTests -B --settings ./.mvn/settings.xml -Dlicense.skip=true
36+
run: ./mvnw deploy -DskipTests -Denforcer.skip=true -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 }}

.github/workflows/support.yaml

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)