From d0bd5bb6d7bfc68fc1453a664b52637f643b541a Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Wed, 29 Jan 2025 22:38:00 -0500
Subject: [PATCH 1/3] fix: animal-sniffer-maven-plugin to a profile

b/384085175#comment40

We can skip animal-sniffer-maven-plugin execution if we wrap it as a profile.
---
 google-oauth-client-appengine/pom.xml | 12 ------
 google-oauth-client-java6/pom.xml     | 12 ------
 google-oauth-client-jetty/pom.xml     | 12 ------
 pom.xml                               | 54 ++++++++++++++++-----------
 4 files changed, 33 insertions(+), 57 deletions(-)

diff --git a/google-oauth-client-appengine/pom.xml b/google-oauth-client-appengine/pom.xml
index cda732087..0a3cde176 100644
--- a/google-oauth-client-appengine/pom.xml
+++ b/google-oauth-client-appengine/pom.xml
@@ -62,18 +62,6 @@
           </execution>
         </executions>
       </plugin>
-      <!--App Engine uses Java 7 or Java 8-->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <configuration>
-          <signature>
-            <groupId>org.codehaus.mojo.signature</groupId>
-            <artifactId>java17</artifactId>
-            <version>1.0</version>
-          </signature>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
diff --git a/google-oauth-client-java6/pom.xml b/google-oauth-client-java6/pom.xml
index f3bb99e1d..49faaf0de 100644
--- a/google-oauth-client-java6/pom.xml
+++ b/google-oauth-client-java6/pom.xml
@@ -47,18 +47,6 @@
           </execution>
         </executions>
       </plugin>
-      <!--Set minimum version to Java 7-->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <configuration>
-          <signature>
-            <groupId>org.codehaus.mojo.signature</groupId>
-            <artifactId>java17</artifactId>
-            <version>1.0</version>
-          </signature>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
diff --git a/google-oauth-client-jetty/pom.xml b/google-oauth-client-jetty/pom.xml
index bca8bd220..77e17aeee 100644
--- a/google-oauth-client-jetty/pom.xml
+++ b/google-oauth-client-jetty/pom.xml
@@ -49,18 +49,6 @@
           </execution>
         </executions>
       </plugin>
-      <!--Minimum version is Java 7 -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <configuration>
-          <signature>
-            <groupId>org.codehaus.mojo.signature</groupId>
-            <artifactId>java17</artifactId>
-            <version>1.0</version>
-          </signature>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 6861b2294..53a388e55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -415,27 +415,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <configuration>
-          <signature>
-            <groupId>org.codehaus.mojo.signature</groupId>
-            <artifactId>java17</artifactId>
-            <version>1.0</version>
-          </signature>
-          <ignores>
-            <ignore>com.sun.net.httpserver.*</ignore>
-          </ignores>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <!-- Build the dependencies report at package time (needed for the assembly artifact). -->
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
@@ -661,5 +640,38 @@
         </snapshotRepository>
       </distributionManagement>
     </profile>
+    <profile>
+      <id>animal-sniffer</id>
+      <activation>
+        <!-- The compatibility check runs by default in CIs -->
+        <jdk>[1.8,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>animal-sniffer-maven-plugin</artifactId>
+            <configuration>
+              <signature>
+                <groupId>org.codehaus.mojo.signature</groupId>
+                <!--Set minimum version to Java 7-->
+                <artifactId>java17</artifactId>
+                <version>1.0</version>
+              </signature>
+              <ignores>
+                <ignore>com.sun.net.httpserver.*</ignore>
+              </ignores>
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>

From 01d82c1232d7e97a847272ed773668f2cfe0e5ff Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Wed, 29 Jan 2025 23:07:38 -0500
Subject: [PATCH 2/3] clirr profile

---
 pom.xml | 87 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 71 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 53a388e55..3ca896c13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -298,6 +298,43 @@
               <artifactId>plexus-sec-dispatcher</artifactId>
               <version>1.4</version>
             </dependency>
+            <!-- SCM -->
+            <dependency>
+              <groupId>org.apache.maven.scm</groupId>
+              <artifactId>maven-scm-api</artifactId>
+              <version>2.0.0</version>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.maven.scm</groupId>
+              <artifactId>maven-scm-manager-plexus</artifactId>
+              <version>2.0.0</version>
+              <scope>runtime</scope>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.maven.scm</groupId>
+              <artifactId>maven-scm-provider-hg</artifactId>
+              <version>2.0.0</version>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.maven.scm</groupId>
+              <artifactId>maven-scm-provider-svn-commons</artifactId>
+              <version>2.0.0</version>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.maven.scm</groupId>
+              <artifactId>maven-scm-provider-svnexe</artifactId>
+              <version>2.0.0</version>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.maven.scm</groupId>
+              <artifactId>maven-scm-provider-git-commons</artifactId>
+              <version>2.0.0</version>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.maven.scm</groupId>
+              <artifactId>maven-scm-provider-gitexe</artifactId>
+              <version>2.0.0</version>
+            </dependency>
           </dependencies>
         </plugin>
         <plugin>
@@ -399,22 +436,6 @@
           </plugins>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>clirr-maven-plugin</artifactId>
-        <configuration>
-          <comparisonVersion>1.19.0</comparisonVersion>
-          <ignoredDifferencesFile>${basedir}/../clirr-ignored-differences.xml</ignoredDifferencesFile>
-          <logResults>true</logResults>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <!-- Build the dependencies report at package time (needed for the assembly artifact). -->
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
@@ -640,6 +661,40 @@
         </snapshotRepository>
       </distributionManagement>
     </profile>
+    <profile>
+      <id>clirr-compatibility-check</id>
+      <!--
+          CLIRR Maven plugin's dependencies are quite old and not available
+          in some build environment (Airlock).
+          https://github.com/googleapis/java-shared-config/issues/956
+          Extracting this plugin declaration as a profile enables us to disable
+          the CLIRR dependency resolution by `mvn -P=-clirr-compatibility-check ...`
+      -->
+      <activation>
+        <!-- The compatibility check runs by default in CIs -->
+        <jdk>[1.8,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>clirr-maven-plugin</artifactId>
+            <configuration>
+              <comparisonVersion>1.19.0</comparisonVersion>
+              <ignoredDifferencesFile>${basedir}/../clirr-ignored-differences.xml</ignoredDifferencesFile>
+              <logResults>true</logResults>
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>animal-sniffer</id>
       <activation>

From 572593a1b580bc28d0d0dd13d7e1adb16d142113 Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Wed, 29 Jan 2025 23:09:12 -0500
Subject: [PATCH 3/3] revert scm dependencies

---
 pom.xml | 37 -------------------------------------
 1 file changed, 37 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3ca896c13..ba62408f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -298,43 +298,6 @@
               <artifactId>plexus-sec-dispatcher</artifactId>
               <version>1.4</version>
             </dependency>
-            <!-- SCM -->
-            <dependency>
-              <groupId>org.apache.maven.scm</groupId>
-              <artifactId>maven-scm-api</artifactId>
-              <version>2.0.0</version>
-            </dependency>
-            <dependency>
-              <groupId>org.apache.maven.scm</groupId>
-              <artifactId>maven-scm-manager-plexus</artifactId>
-              <version>2.0.0</version>
-              <scope>runtime</scope>
-            </dependency>
-            <dependency>
-              <groupId>org.apache.maven.scm</groupId>
-              <artifactId>maven-scm-provider-hg</artifactId>
-              <version>2.0.0</version>
-            </dependency>
-            <dependency>
-              <groupId>org.apache.maven.scm</groupId>
-              <artifactId>maven-scm-provider-svn-commons</artifactId>
-              <version>2.0.0</version>
-            </dependency>
-            <dependency>
-              <groupId>org.apache.maven.scm</groupId>
-              <artifactId>maven-scm-provider-svnexe</artifactId>
-              <version>2.0.0</version>
-            </dependency>
-            <dependency>
-              <groupId>org.apache.maven.scm</groupId>
-              <artifactId>maven-scm-provider-git-commons</artifactId>
-              <version>2.0.0</version>
-            </dependency>
-            <dependency>
-              <groupId>org.apache.maven.scm</groupId>
-              <artifactId>maven-scm-provider-gitexe</artifactId>
-              <version>2.0.0</version>
-            </dependency>
           </dependencies>
         </plugin>
         <plugin>