Skip to content

Commit 9a4f6ec

Browse files
authored
Re-enable japicmp enforcement (#2086)
1 parent 1d82229 commit 9a4f6ec

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

.github/workflows/maven-build.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Maven Install (skipTests)
3636
env:
3737
MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
38-
run: mvn -B clean install -Djapicmp.skip=true -DskipTests --file pom.xml
38+
run: mvn -B clean install -DskipTests --file pom.xml
3939
- uses: actions/upload-artifact@v4
4040
with:
4141
name: maven-target-directory
@@ -59,7 +59,7 @@ jobs:
5959
MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
6060
# running install site seems to more closely imitate real site deployment,
6161
# more likely to prevent failed deployment
62-
run: mvn -B clean install site -Djapicmp.skip=true -DskipTests --file pom.xml
62+
run: mvn -B clean install site -DskipTests --file pom.xml
6363
test-bridged:
6464
name: build-and-test Bridged (Java 17)
6565
# Does not require build output, but orders execution to prevent launching test workflows when simple build fails
@@ -78,8 +78,7 @@ jobs:
7878
- name: Maven Install (skipTests)
7979
env:
8080
MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
81-
#skipping japicmp check for bridged artifact until after next release
82-
run: mvn -B clean install -Djapicmp.skip=true -Pbridged -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
81+
run: mvn -B clean install -Pbridged -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
8382
test:
8483
name: test (${{ matrix.os }}, Java ${{ matrix.java }})
8584
# Does not require build output, but orders execution to prevent launching test workflows when simple build fails
@@ -108,8 +107,7 @@ jobs:
108107
if: matrix.os != 'windows'
109108
env:
110109
MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
111-
# Disable japicmp until next release
112-
run: mvn -B clean install -Djapicmp.skip=true -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
110+
run: mvn -B clean install -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
113111
- name: Save coverage data
114112
if: matrix.os == 'ubuntu' && matrix.java == '17'
115113
uses: actions/upload-artifact@v4

.github/workflows/publish_release_branch.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Maven Install and Site with Code Coverage
2424
env:
2525
MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
26-
run: mvn -B clean install site -Djapicmp.skip=true -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
26+
run: mvn -B clean install site -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
2727

2828
- uses: actions/upload-artifact@v4
2929
with:
@@ -49,15 +49,15 @@ jobs:
4949
gpg-passphrase: MAVEN_GPG_PASSPHRASE
5050

5151
- name: Publish package
52-
run: mvn -B clean deploy -Djapicmp.skip=true -DskipTests -Prelease
52+
run: mvn -B clean deploy -DskipTests -Prelease
5353
env:
5454
MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
5555
MAVEN_USERNAME: ${{ secrets.OSSRH_TOKEN_USERNAME }}
5656
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN_PASSWORD }}
5757
MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSPHRASE }}
5858

5959
- name: Publish package with bridge methods
60-
run: mvn -B clean deploy -Djapicmp.skip=true -DskipTests -Prelease -Pbridged
60+
run: mvn -B clean deploy -DskipTests -Prelease -Pbridged
6161
env:
6262
MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
6363
MAVEN_USERNAME: ${{ secrets.OSSRH_TOKEN_USERNAME }}

0 commit comments

Comments
 (0)