From aecf85d40d63c26d7f576dde04d5135f292518ba Mon Sep 17 00:00:00 2001
From: Liam Newman <bitwiseman@gmail.com>
Date: Sat, 12 Apr 2025 11:43:43 -0700
Subject: [PATCH] Re-enable japicmp enforcement

---
 .github/workflows/maven-build.yml            | 10 ++++------
 .github/workflows/publish_release_branch.yml |  6 +++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index fa455bcce6..33f089f717 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -35,7 +35,7 @@ jobs:
     - name: Maven Install (skipTests)
       env:
         MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
-      run: mvn -B clean install -Djapicmp.skip=true -DskipTests --file pom.xml
+      run: mvn -B clean install -DskipTests --file pom.xml
     - uses: actions/upload-artifact@v4
       with:
         name: maven-target-directory
@@ -59,7 +59,7 @@ jobs:
         MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
       # running install site seems to more closely imitate real site deployment,
       # more likely to prevent failed deployment
-      run: mvn -B clean install site -Djapicmp.skip=true -DskipTests --file pom.xml
+      run: mvn -B clean install site -DskipTests --file pom.xml
   test-bridged:
     name: build-and-test Bridged (Java 17)
     # Does not require build output, but orders execution to prevent launching test workflows when simple build fails 
@@ -78,8 +78,7 @@ jobs:
     - name: Maven Install (skipTests)
       env:
         MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
-      #skipping japicmp check for bridged artifact until after next release
-      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"
+      run: mvn -B clean install -Pbridged -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
   test:
     name: test (${{ matrix.os }}, Java ${{ matrix.java }})
     # Does not require build output, but orders execution to prevent launching test workflows when simple build fails 
@@ -108,8 +107,7 @@ jobs:
       if: matrix.os != 'windows'
       env:
         MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
-      # Disable japicmp until next release
-      run: mvn -B clean install -Djapicmp.skip=true -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
+      run: mvn -B clean install -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
     - name: Save coverage data
       if: matrix.os == 'ubuntu' && matrix.java == '17'
       uses: actions/upload-artifact@v4
diff --git a/.github/workflows/publish_release_branch.yml b/.github/workflows/publish_release_branch.yml
index 28134e332e..72e5c21a0f 100644
--- a/.github/workflows/publish_release_branch.yml
+++ b/.github/workflows/publish_release_branch.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Maven Install and Site with Code Coverage
         env:
           MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
-        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"
+        run: mvn -B clean install site -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
 
       - uses: actions/upload-artifact@v4
         with:
@@ -49,7 +49,7 @@ jobs:
           gpg-passphrase: MAVEN_GPG_PASSPHRASE
 
       - name: Publish package
-        run: mvn -B clean deploy -Djapicmp.skip=true -DskipTests -Prelease
+        run: mvn -B clean deploy -DskipTests -Prelease
         env:
           MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
           MAVEN_USERNAME: ${{ secrets.OSSRH_TOKEN_USERNAME }}
@@ -57,7 +57,7 @@ jobs:
           MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSPHRASE }}
 
       - name: Publish package with bridge methods 
-        run: mvn -B clean deploy -Djapicmp.skip=true -DskipTests -Prelease -Pbridged
+        run: mvn -B clean deploy -DskipTests -Prelease -Pbridged
         env:
           MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
           MAVEN_USERNAME: ${{ secrets.OSSRH_TOKEN_USERNAME }}