From 56d15a469df88d4e4b59169701640277b5a963a7 Mon Sep 17 00:00:00 2001
From: Alex Herbert <aherbert@apache.org>
Date: Sat, 12 Feb 2022 09:14:06 +0000
Subject: [PATCH 1/2] Use default goal in github action

Effectively changes from 'package' to 'verify' with additional
checkstyle and javadoc checks.
---
 .github/workflows/maven.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 91f44c209..d3e698426 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -44,4 +44,5 @@ jobs:
         distribution: adopt
         java-version: ${{ matrix.java }}
     - name: Build with Maven
-      run: mvn -V package --file pom.xml --no-transfer-progress
+      # Use the default goal
+      run: mvn -V --file pom.xml --no-transfer-progress

From c68c4b2c72b9c1dd00a93d7bab402fad9ee73e26 Mon Sep 17 00:00:00 2001
From: Alex Herbert <aherbert@apache.org>
Date: Sat, 12 Feb 2022 09:22:27 +0000
Subject: [PATCH 2/2] Change clirr to japicmp for binary compatibility check

---
 pom.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 147076289..549bcc8c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -588,6 +588,9 @@
     <commons.jacoco.version>0.8.7</commons.jacoco.version>
     <commons.junit.version>5.8.2</commons.junit.version>
 
+    <!-- Override commons parent version to allow build on java 17 -->
+    <commons.japicmp.version>0.15.4</commons.japicmp.version>
+
     <!--Commons Release Plugin -->
     <commons.bc.version>4.4</commons.bc.version>
     <commons.release.isDistModule>true</commons.release.isDistModule>
@@ -598,7 +601,7 @@
 
 
   <build>
-    <defaultGoal>clean verify apache-rat:check checkstyle:check clirr:check javadoc:javadoc</defaultGoal>
+    <defaultGoal>clean verify apache-rat:check checkstyle:check japicmp:cmp javadoc:javadoc</defaultGoal>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>