From 8e6ce3aeea86c3019677d599f0e0d82ffdadbd04 Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Mon, 23 Dec 2024 15:20:36 -0500
Subject: [PATCH 01/12] ci: profile to upload to GCP Artifact Registry (#1132)

* ci: profile to upload to GCP Artifact Registry

* A profile to avoid using nexus-staging-maven-plugin
---
 google-oauth-client-bom/pom.xml | 62 +++++++++++++++++++++++++++------
 pom.xml                         | 47 ++++++++++++++++++++++---
 2 files changed, 93 insertions(+), 16 deletions(-)

diff --git a/google-oauth-client-bom/pom.xml b/google-oauth-client-bom/pom.xml
index c960fa87c..eee598c95 100644
--- a/google-oauth-client-bom/pom.xml
+++ b/google-oauth-client-bom/pom.xml
@@ -89,17 +89,6 @@
   </dependencyManagement>
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
-        <version>1.6.13</version>
-        <extensions>true</extensions>
-        <configuration>
-          <serverId>sonatype-nexus-staging</serverId>
-          <nexusUrl>https://google.oss.sonatype.org/</nexusUrl>
-          <autoReleaseAfterClose>false</autoReleaseAfterClose>
-        </configuration>
-      </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>3.4.1</version>
@@ -134,6 +123,57 @@
   </build>
 
   <profiles>
+    <!-- Because the BOM artifact does not need to inherit other properties such as dependencies
+        in the root pom.xml, this needs to define publication-related profiles. -->
+    <profile>
+      <!-- By default, we release artifacts to Sonatype, which requires
+          nexus-staging-maven-plugin. -->
+      <id>release-sonatype</id>
+      <activation>
+        <property>
+          <!-- Only when we use the release-gcp-artifact-registry profile,
+          which comes with artifact-registry-url property, this profile is
+          turned off. -->
+          <name>!artifact-registry-url</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.sonatype.plugins</groupId>
+            <artifactId>nexus-staging-maven-plugin</artifactId>
+            <version>1.6.13</version>
+            <extensions>true</extensions>
+            <configuration>
+              <serverId>sonatype-nexus-staging</serverId>
+              <nexusUrl>https://google.oss.sonatype.org/</nexusUrl>
+              <autoReleaseAfterClose>false</autoReleaseAfterClose>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <!-- Optionally, we can publish the artifacts to GCP Artifact Registry specifying
+          this release-gcp-artifact-registry profile:
+          mvn deploy -P=release-gcp-artifact-registry -P=-release-sonatype \
+              -Dartifact-registry-url=artifactregistry://us-maven.pkg.dev/...
+          -->
+      <id>release-gcp-artifact-registry</id>
+      <properties>
+        <artifact-registry-url>artifactregistry://please-define-artifact-registry-url-property</artifact-registry-url>
+      </properties>
+      <distributionManagement>
+        <repository>
+          <id>gcp-artifact-registry-repository</id>
+          <url>${artifact-registry-url}</url>
+        </repository>
+        <snapshotRepository>
+          <id>gcp-artifact-registry-repository</id>
+          <url>${artifact-registry-url}</url>
+        </snapshotRepository>
+      </distributionManagement>
+    </profile>
     <profile>
       <id>release-sign-artifacts</id>
       <activation>
diff --git a/pom.xml b/pom.xml
index 82f9dc1e7..a6f03ecdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -432,10 +432,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
-      </plugin>
       <plugin>
         <groupId>com.coveo</groupId>
         <artifactId>fmt-maven-plugin</artifactId>
@@ -517,7 +513,6 @@
         </plugins>
       </build>
     </profile>
-
     <profile>
       <id>docFX</id>
       <activation>
@@ -578,5 +573,47 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <!-- By default, we release artifacts to Sonatype, which requires
+          nexus-staging-maven-plugin. -->
+      <id>release-sonatype</id>
+      <activation>
+        <property>
+          <!-- Only when we use the release-gcp-artifact-registry profile,
+          which comes with artifact-registry-url property, this profile is
+          turned off. -->
+          <name>!artifact-registry-url</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.sonatype.plugins</groupId>
+            <artifactId>nexus-staging-maven-plugin</artifactId>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <!-- Optionally, we can publish the artifacts to GCP Artifact Registry specifying
+          this release-gcp-artifact-registry profile:
+          mvn deploy -P=release-gcp-artifact-registry -P=-release-sonatype \
+              -Dartifact-registry-url=artifactregistry://us-maven.pkg.dev/...
+          -->
+      <id>release-gcp-artifact-registry</id>
+      <properties>
+        <artifact-registry-url>artifactregistry://please-define-artifact-registry-url-property</artifact-registry-url>
+      </properties>
+      <distributionManagement>
+        <repository>
+          <id>gcp-artifact-registry-repository</id>
+          <url>${artifact-registry-url}</url>
+        </repository>
+        <snapshotRepository>
+          <id>gcp-artifact-registry-repository</id>
+          <url>${artifact-registry-url}</url>
+        </snapshotRepository>
+      </distributionManagement>
+    </profile>
   </profiles>
 </project>

From 9ff0f6bc57e4449f2877d3a3d5ac8e8adbc326e9 Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Wed, 8 Jan 2025 19:31:44 -0500
Subject: [PATCH 02/12] fix: javadoc fix in IdTokenVerifier (#1134)

---
 .../google/api/client/auth/openidconnect/IdTokenVerifier.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-oauth-client/src/main/java/com/google/api/client/auth/openidconnect/IdTokenVerifier.java b/google-oauth-client/src/main/java/com/google/api/client/auth/openidconnect/IdTokenVerifier.java
index 8e769fd72..979bfeb0e 100644
--- a/google-oauth-client/src/main/java/com/google/api/client/auth/openidconnect/IdTokenVerifier.java
+++ b/google-oauth-client/src/main/java/com/google/api/client/auth/openidconnect/IdTokenVerifier.java
@@ -103,7 +103,7 @@
  *
  * <p>Note that {@link #verify(IdToken)} only implements a subset of the verification steps, mostly
  * just the MUST steps. Please read <a
- * href="http://openid.net/specs/openid-connect-basic-1_0-27.html#id.token.validation>ID Token
+ * href="http://openid.net/specs/openid-connect-basic-1_0-27.html#id.token.validation">ID Token
  * Validation</a> for the full list of verification steps.
  *
  * @since 1.16

From b67665781ebb88a4ce209d6658970939808675a9 Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Thu, 9 Jan 2025 12:59:56 -0500
Subject: [PATCH 03/12] ci: Airlock-friendly build dependencies (#1135)

---
 pom.xml                                      | 14 ++++++--
 samples/dailymotion-cmdline-sample/pom.xml   | 35 +++++++++++++++-----
 samples/keycloak-pkce-cmdline-sample/pom.xml | 35 +++++++++++++++-----
 samples/pom.xml                              | 35 +++++++++++++++-----
 4 files changed, 93 insertions(+), 26 deletions(-)

diff --git a/pom.xml b/pom.xml
index a6f03ecdf..7071f3a0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -284,13 +284,23 @@
           <artifactId>maven-site-plugin</artifactId>
           <version>3.12.1</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>3.4.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>3.1.3</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.1.0</version><executions>
+        <version>3.5.0</version><executions>
         <execution>
           <id>enforce-maven</id>
           <goals>
@@ -493,7 +503,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.0.1</version>
+            <version>3.2.7</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
diff --git a/samples/dailymotion-cmdline-sample/pom.xml b/samples/dailymotion-cmdline-sample/pom.xml
index e1bb58304..d1ce5b83d 100644
--- a/samples/dailymotion-cmdline-sample/pom.xml
+++ b/samples/dailymotion-cmdline-sample/pom.xml
@@ -73,14 +73,6 @@
           <skip>true</skip>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
-        <version>1.6.13</version>
-        <configuration>
-          <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-        </configuration>
-      </plugin>
     </plugins>
     <finalName>${project.artifactId}-${project.version}</finalName>
   </build>
@@ -109,4 +101,31 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
+  <profiles>
+    <profile>
+      <!-- By default, we release artifacts to Sonatype, which requires
+          nexus-staging-maven-plugin. -->
+      <id>release-sonatype</id>
+      <activation>
+        <property>
+          <!-- Only when we use the release-gcp-artifact-registry profile,
+          which comes with artifact-registry-url property, this profile is
+          turned off. -->
+          <name>!artifact-registry-url</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.sonatype.plugins</groupId>
+            <artifactId>nexus-staging-maven-plugin</artifactId>
+            <version>1.6.13</version>
+            <configuration>
+              <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/samples/keycloak-pkce-cmdline-sample/pom.xml b/samples/keycloak-pkce-cmdline-sample/pom.xml
index 983ca6229..ee5b5e235 100644
--- a/samples/keycloak-pkce-cmdline-sample/pom.xml
+++ b/samples/keycloak-pkce-cmdline-sample/pom.xml
@@ -73,14 +73,6 @@
           <skip>true</skip>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
-        <version>1.6.13</version>
-        <configuration>
-          <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-        </configuration>
-      </plugin>
     </plugins>
     <finalName>${project.artifactId}-${project.version}</finalName>
   </build>
@@ -109,4 +101,31 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
+  <profiles>
+    <profile>
+      <!-- By default, we release artifacts to Sonatype, which requires
+          nexus-staging-maven-plugin. -->
+      <id>release-sonatype</id>
+      <activation>
+        <property>
+          <!-- Only when we use the release-gcp-artifact-registry profile,
+          which comes with artifact-registry-url property, this profile is
+          turned off. -->
+          <name>!artifact-registry-url</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.sonatype.plugins</groupId>
+            <artifactId>nexus-staging-maven-plugin</artifactId>
+            <version>1.6.13</version>
+            <configuration>
+              <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/samples/pom.xml b/samples/pom.xml
index 820a81719..92dc53626 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -43,14 +43,33 @@
           <skip>true</skip>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
-        <version>1.6.13</version>
-        <configuration>
-          <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
+  <profiles>
+    <profile>
+      <!-- By default, we release artifacts to Sonatype, which requires
+          nexus-staging-maven-plugin. -->
+      <id>release-sonatype</id>
+      <activation>
+        <property>
+          <!-- Only when we use the release-gcp-artifact-registry profile,
+          which comes with artifact-registry-url property, this profile is
+          turned off. -->
+          <name>!artifact-registry-url</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.sonatype.plugins</groupId>
+            <artifactId>nexus-staging-maven-plugin</artifactId>
+            <version>1.6.13</version>
+            <configuration>
+              <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project> 

From 96303f13c888aa4587682a7a2426eb185f4ec953 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 17 Jan 2025 09:01:59 -0500
Subject: [PATCH 04/12] chore(main): release 1.38.0-SNAPSHOT (#1129)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 google-oauth-client-appengine/pom.xml        |  2 +-
 google-oauth-client-assembly/pom.xml         |  2 +-
 google-oauth-client-bom/pom.xml              | 12 ++++++------
 google-oauth-client-java6/pom.xml            |  2 +-
 google-oauth-client-jetty/pom.xml            |  2 +-
 google-oauth-client-servlet/pom.xml          |  2 +-
 google-oauth-client/pom.xml                  |  2 +-
 pom.xml                                      |  2 +-
 samples/dailymotion-cmdline-sample/pom.xml   |  2 +-
 samples/keycloak-pkce-cmdline-sample/pom.xml |  2 +-
 versions.txt                                 |  2 +-
 11 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/google-oauth-client-appengine/pom.xml b/google-oauth-client-appengine/pom.xml
index ec8c2a820..24cb5e6a4 100644
--- a/google-oauth-client-appengine/pom.xml
+++ b/google-oauth-client-appengine/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.oauth-client</groupId>
     <artifactId>google-oauth-client-parent</artifactId>
-    <version>1.37.0</version><!-- {x-version-update:google-oauth-client:current} -->
+    <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-oauth-client-appengine</artifactId>
diff --git a/google-oauth-client-assembly/pom.xml b/google-oauth-client-assembly/pom.xml
index 67c0665a7..49938967c 100644
--- a/google-oauth-client-assembly/pom.xml
+++ b/google-oauth-client-assembly/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.oauth-client</groupId>
     <artifactId>google-oauth-client-parent</artifactId>
-    <version>1.37.0</version><!-- {x-version-update:google-oauth-client:current} -->
+    <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>com.google.oauth-client</groupId>
diff --git a/google-oauth-client-bom/pom.xml b/google-oauth-client-bom/pom.xml
index eee598c95..10ddbd7c1 100644
--- a/google-oauth-client-bom/pom.xml
+++ b/google-oauth-client-bom/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.oauth-client</groupId>
   <artifactId>google-oauth-client-bom</artifactId>
-  <version>1.37.0</version><!-- {x-version-update:google-oauth-client:current} -->
+  <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
   <packaging>pom</packaging>
 
   <name>Google OAuth Client Library for Java BOM</name>
@@ -63,27 +63,27 @@
       <dependency>
         <groupId>com.google.oauth-client</groupId>
         <artifactId>google-oauth-client</artifactId>
-        <version>1.37.0</version><!-- {x-version-update:google-oauth-client:current} -->
+        <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.oauth-client</groupId>
         <artifactId>google-oauth-client-appengine</artifactId>
-        <version>1.37.0</version><!-- {x-version-update:google-oauth-client:current} -->
+        <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.oauth-client</groupId>
         <artifactId>google-oauth-client-java6</artifactId>
-        <version>1.37.0</version><!-- {x-version-update:google-oauth-client:current} -->
+        <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.oauth-client</groupId>
         <artifactId>google-oauth-client-jetty</artifactId>
-        <version>1.37.0</version><!-- {x-version-update:google-oauth-client:current} -->
+        <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.oauth-client</groupId>
         <artifactId>google-oauth-client-servlet</artifactId>
-        <version>1.37.0</version><!-- {x-version-update:google-oauth-client:current} -->
+        <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/google-oauth-client-java6/pom.xml b/google-oauth-client-java6/pom.xml
index 618a50583..ee7b35e00 100644
--- a/google-oauth-client-java6/pom.xml
+++ b/google-oauth-client-java6/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.oauth-client</groupId>
     <artifactId>google-oauth-client-parent</artifactId>
-    <version>1.37.0</version><!-- {x-version-update:google-oauth-client:current} -->
+    <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-oauth-client-java6</artifactId>
diff --git a/google-oauth-client-jetty/pom.xml b/google-oauth-client-jetty/pom.xml
index f7a1eda7c..fb7e8563c 100644
--- a/google-oauth-client-jetty/pom.xml
+++ b/google-oauth-client-jetty/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.oauth-client</groupId>
     <artifactId>google-oauth-client-parent</artifactId>
-    <version>1.37.0</version><!-- {x-version-update:google-oauth-client:current} -->
+    <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-oauth-client-jetty</artifactId>
diff --git a/google-oauth-client-servlet/pom.xml b/google-oauth-client-servlet/pom.xml
index e1a24eb59..91016ce17 100644
--- a/google-oauth-client-servlet/pom.xml
+++ b/google-oauth-client-servlet/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.oauth-client</groupId>
     <artifactId>google-oauth-client-parent</artifactId>
-    <version>1.37.0</version><!-- {x-version-update:google-oauth-client:current} -->
+    <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-oauth-client-servlet</artifactId>
diff --git a/google-oauth-client/pom.xml b/google-oauth-client/pom.xml
index 6d4d4a570..496786a5f 100644
--- a/google-oauth-client/pom.xml
+++ b/google-oauth-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.oauth-client</groupId>
     <artifactId>google-oauth-client-parent</artifactId>
-    <version>1.37.0</version><!-- {x-version-update:google-oauth-client:current} -->
+    <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-oauth-client</artifactId>
diff --git a/pom.xml b/pom.xml
index 7071f3a0e..ab53aa2ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>com.google.oauth-client</groupId>
   <artifactId>google-oauth-client-parent</artifactId>
-  <version>1.37.0</version><!-- {x-version-update:google-oauth-client:current} -->
+  <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
   <packaging>pom</packaging>
   <name>Parent for the Google OAuth Client Library for Java</name>
   <description>Google OAuth Client Library for Java</description>
diff --git a/samples/dailymotion-cmdline-sample/pom.xml b/samples/dailymotion-cmdline-sample/pom.xml
index d1ce5b83d..1638a919d 100644
--- a/samples/dailymotion-cmdline-sample/pom.xml
+++ b/samples/dailymotion-cmdline-sample/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.oauth-client</groupId>
     <artifactId>google-oauth-client-parent</artifactId>
-    <version>1.37.0</version><!-- {x-version-update:google-oauth-client:current} -->
+    <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>dailymotion-simple-cmdline-sample</artifactId>
diff --git a/samples/keycloak-pkce-cmdline-sample/pom.xml b/samples/keycloak-pkce-cmdline-sample/pom.xml
index ee5b5e235..20b98a2cd 100644
--- a/samples/keycloak-pkce-cmdline-sample/pom.xml
+++ b/samples/keycloak-pkce-cmdline-sample/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.oauth-client</groupId>
     <artifactId>google-oauth-client-parent</artifactId>
-    <version>1.37.0</version><!-- {x-version-update:google-oauth-client:current} -->
+    <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>keycloak-pkce-cmdline-sample</artifactId>
diff --git a/versions.txt b/versions.txt
index 7bbc36cba..c4efb152b 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
 # Format:
 # module:released-version:current-version
 
-google-oauth-client:1.37.0:1.37.0
+google-oauth-client:1.37.0:1.38.0-SNAPSHOT

From d79e42b4fdb1a045b90e28a1ceb3f2093fc186e5 Mon Sep 17 00:00:00 2001
From: Min Zhu <zhumin@google.com>
Date: Thu, 23 Jan 2025 16:52:52 -0500
Subject: [PATCH 05/12] chore: fix broken link for javadoc. (#1142)

---
 google-oauth-client-appengine/pom.xml | 2 +-
 google-oauth-client-java6/pom.xml     | 2 +-
 google-oauth-client-jetty/pom.xml     | 2 +-
 google-oauth-client-servlet/pom.xml   | 2 +-
 google-oauth-client/pom.xml           | 2 +-
 pom.xml                               | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/google-oauth-client-appengine/pom.xml b/google-oauth-client-appengine/pom.xml
index 24cb5e6a4..cda732087 100644
--- a/google-oauth-client-appengine/pom.xml
+++ b/google-oauth-client-appengine/pom.xml
@@ -31,7 +31,7 @@
           <links>
             <link>https://download.oracle.com/javase/7/docs/api/</link>
             <link>https://cloud.google.com/appengine/docs/standard/java/javadoc/</link>
-            <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
+            <link>https://cloud.google.com/java/docs/reference/google-http-client/${project.http.version}/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>
diff --git a/google-oauth-client-java6/pom.xml b/google-oauth-client-java6/pom.xml
index ee7b35e00..f3bb99e1d 100644
--- a/google-oauth-client-java6/pom.xml
+++ b/google-oauth-client-java6/pom.xml
@@ -16,7 +16,7 @@
         <configuration>
           <links>
             <link>http://download.oracle.com/javase/7/docs/api/</link>
-            <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
+            <link>https://cloud.google.com/java/docs/reference/google-http-client/${project.http.version}/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>
diff --git a/google-oauth-client-jetty/pom.xml b/google-oauth-client-jetty/pom.xml
index fb7e8563c..bca8bd220 100644
--- a/google-oauth-client-jetty/pom.xml
+++ b/google-oauth-client-jetty/pom.xml
@@ -18,7 +18,7 @@
         <configuration>
           <links>
             <link>http://download.oracle.com/javase/7/docs/api/</link>
-            <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
+            <link>https://cloud.google.com/java/docs/reference/google-http-client/${project.http.version}/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>
diff --git a/google-oauth-client-servlet/pom.xml b/google-oauth-client-servlet/pom.xml
index 91016ce17..623955b9a 100644
--- a/google-oauth-client-servlet/pom.xml
+++ b/google-oauth-client-servlet/pom.xml
@@ -17,7 +17,7 @@
           <links>
             <link>https://download.oracle.com/javase/7/docs/api/</link>
             <link>https://cloud.google.com/appengine/docs/standard/java/javadoc/</link>
-            <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
+            <link>https://cloud.google.com/java/docs/reference/google-http-client/${project.http.version}/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>
diff --git a/google-oauth-client/pom.xml b/google-oauth-client/pom.xml
index 496786a5f..54a2e4cef 100644
--- a/google-oauth-client/pom.xml
+++ b/google-oauth-client/pom.xml
@@ -21,7 +21,7 @@
         <configuration>
           <links>
             <link>http://download.oracle.com/javase/7/docs/api/</link>
-            <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
+            <link>https://cloud.google.com/java/docs/reference/google-http-client/${project.http.version}/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>
diff --git a/pom.xml b/pom.xml
index ab53aa2ec..988a31d4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -333,7 +333,7 @@
               <links>
                 <link>https://docs.oracle.com/javase/7/docs/api/</link>
                 <link>https://cloud.google.com/appengine/docs/java/javadoc</link>
-                <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
+                <link>https://cloud.google.com/java/docs/reference/google-http-client/${project.http.version}/</link>
               </links>
               <doctitle>Google OAuth Client Library for Java ${project.version}</doctitle>
               <excludePackageNames>com.google.api.services</excludePackageNames>

From 11a8fca5203bde8721915dd57fef0094015ca51e Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Fri, 24 Jan 2025 08:25:44 -0500
Subject: [PATCH 06/12] deps: newer Maven plugin versions for Airlock (#1140)

* deps: newer Maven plugin versions for Airlock

* Newer Javadoc version

* checkstyle to profile

* checkstyle.xml fix

* allowUndeclaredRTE was removed

* scope => accessModifiers

* project-info-reports:dependencies changed site to reports
---
 .github/workflows/ci.yaml                    |  2 +
 checkstyle.xml                               |  2 +-
 google-oauth-client-assembly/assembly.xml    | 14 ++--
 pom.xml                                      | 78 ++++++++++++++------
 samples/checkstyle.xml                       | 37 +++++-----
 samples/dailymotion-cmdline-sample/pom.xml   | 50 +++++++++----
 samples/keycloak-pkce-cmdline-sample/pom.xml | 50 +++++++++----
 7 files changed, 152 insertions(+), 81 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index eb3e74f0b..6ea8645a1 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -8,6 +8,7 @@ jobs:
   units:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         java: [8, 11, 17]
     steps:
@@ -22,6 +23,7 @@ jobs:
   dependencies:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         java: [8, 11, 17]
     steps:
diff --git a/checkstyle.xml b/checkstyle.xml
index d5bf01f43..3ef76fc88 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -67,7 +67,7 @@ page at http://checkstyle.sourceforge.net/config.html -->
     <!-- Checks for Javadoc comments.                     -->
     <!-- See http://checkstyle.sf.net/config_javadoc.html -->
     <module name="JavadocMethod">
-      <property name="scope" value="protected"/>
+      <property name="accessModifiers" value="protected"/>
       <property name="severity" value="warning"/>
       <property name="allowMissingParamTags" value="true"/>
       <property name="allowMissingReturnTag" value="true"/>
diff --git a/google-oauth-client-assembly/assembly.xml b/google-oauth-client-assembly/assembly.xml
index b1d857cb7..e4e1699bc 100644
--- a/google-oauth-client-assembly/assembly.xml
+++ b/google-oauth-client-assembly/assembly.xml
@@ -64,38 +64,38 @@
     </file>
     <!-- dependencies.html files -->
     <file>
-      <source>../google-oauth-client/target/site/dependencies.html</source>
+      <source>../google-oauth-client/target/reports/dependencies.html</source>
       <destName>google-oauth-client-dependencies.html</destName>
       <outputDirectory>google-oauth-java-client/dependencies</outputDirectory>
     </file>
     <file>
-      <source>../google-oauth-client-appengine/target/site/dependencies.html</source>
+      <source>../google-oauth-client-appengine/target/reports/dependencies.html</source>
       <destName>google-oauth-client-appengine-dependencies.html</destName>
       <outputDirectory>google-oauth-java-client/dependencies</outputDirectory>
     </file>
     <file>
-      <source>../google-oauth-client-java6/target/site/dependencies.html</source>
+      <source>../google-oauth-client-java6/target/reports/dependencies.html</source>
       <destName>google-oauth-client-java6-dependencies.html</destName>
       <outputDirectory>google-oauth-java-client/dependencies</outputDirectory>
     </file>
     <file>
-      <source>../google-oauth-client-jetty/target/site/dependencies.html</source>
+      <source>../google-oauth-client-jetty/target/reports/dependencies.html</source>
       <destName>google-oauth-client-jetty-dependencies.html</destName>
       <outputDirectory>google-oauth-java-client/dependencies</outputDirectory>
     </file>
     <file>
-      <source>../google-oauth-client-servlet/target/site/dependencies.html</source>
+      <source>../google-oauth-client-servlet/target/reports/dependencies.html</source>
       <destName>google-oauth-client-servlet-dependencies.html</destName>
       <outputDirectory>google-oauth-java-client/dependencies</outputDirectory>
     </file>
   </files>
   <fileSets>
     <fileSet>
-      <directory>target/site/css</directory>
+      <directory>target/reports/css</directory>
       <outputDirectory>google-oauth-java-client/dependencies/css</outputDirectory>
     </fileSet>
     <fileSet>
-      <directory>target/site/images</directory>
+      <directory>target/reports/images</directory>
       <outputDirectory>google-oauth-java-client/dependencies/images</outputDirectory>
     </fileSet>
     <fileSet>
diff --git a/pom.xml b/pom.xml
index 988a31d4e..fc93d091f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -225,7 +225,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.6.3</version>
+          <version>3.11.2</version>
           <executions>
             <execution>
               <id>attach-javadocs</id>
@@ -234,6 +234,13 @@
               </goals>
             </execution>
           </executions>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.wagon</groupId>
+              <artifactId>wagon-provider-api</artifactId>
+              <version>3.3.3</version>
+            </dependency>
+          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -257,7 +264,14 @@
         </plugin>
         <plugin>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.6.0</version>
+          <dependencies>
+            <dependency>
+              <groupId>com.puppycrawl.tools</groupId>
+              <artifactId>checkstyle</artifactId>
+              <version>10.21.1</version>
+            </dependency>
+          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -272,17 +286,24 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>animal-sniffer-maven-plugin</artifactId>
-          <version>1.22</version>
+          <version>1.24</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>3.5.0</version>
+          <version>3.8.0</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.sonatype.plexus</groupId>
+              <artifactId>plexus-sec-dispatcher</artifactId>
+              <version>1.4</version>
+            </dependency>
+          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.12.1</version>
+          <version>3.21.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -364,21 +385,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>checkstyle.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
@@ -441,6 +447,10 @@
             <phase>package</phase>
           </execution>
         </executions>
+        <configuration>
+          <!-- Helpful to see Airlock dependency resolutions -->
+          <skip>${mpir.skip}</skip>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>com.coveo</groupId>
@@ -487,9 +497,36 @@
     <project.datanucleus-maven-plugin.version>5.2.1</project.datanucleus-maven-plugin.version>
     <project.servlet-api.version>2.5</project.servlet-api.version>
     <deploy.autorelease>false</deploy.autorelease>
+    <mpir.skip>false</mpir.skip>
   </properties>
 
   <profiles>
+    <profile>
+      <id>checkstyle</id>
+      <activation>
+        <!-- Checkstyle plugin's dependency now requires Java 11 or higher -->
+        <jdk>[11,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <configuration>
+              <configLocation>checkstyle.xml</configLocation>
+              <consoleOutput>true</consoleOutput>
+              <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>release-sign-artifacts</id>
       <activation>
@@ -542,7 +579,6 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.6.3</version>
             <configuration>
               <doclet>com.microsoft.doclet.DocFxDoclet</doclet>
               <useStandardDocletOptions>false</useStandardDocletOptions>
diff --git a/samples/checkstyle.xml b/samples/checkstyle.xml
index 66cd0c954..0f200449f 100644
--- a/samples/checkstyle.xml
+++ b/samples/checkstyle.xml
@@ -84,14 +84,10 @@ page at http://checkstyle.sourceforge.net/config.html -->
     <!-- Checks for Javadoc comments.                     -->
     <!-- See http://checkstyle.sf.net/config_javadoc.html -->
     <module name="JavadocMethod">
-      <property name="scope" value="protected"/>
+      <property name="accessModifiers" value="protected"/>
       <property name="severity" value="warning"/>
-      <property name="allowMissingJavadoc" value="true"/>
       <property name="allowMissingParamTags" value="true"/>
       <property name="allowMissingReturnTag" value="true"/>
-      <property name="allowMissingThrowsTags" value="true"/>
-      <property name="allowThrowsTagsForSubclasses" value="true"/>
-      <property name="allowUndeclaredRTE" value="true"/>
     </module>
 
     <module name="JavadocType">
@@ -197,21 +193,6 @@ page at http://checkstyle.sourceforge.net/config.html -->
 
     -->
 
-    <module name="LineLength">
-      <!-- Checks if a line is too long. -->
-      <property name="max" value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.max}" default="100"/>
-      <property name="severity" value="error"/>
-
-      <!--
-        The default ignore pattern exempts the following elements:
-          - import statements
-          - long URLs inside comments
-      -->
-
-      <property name="ignorePattern"
-          value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.ignorePattern}"
-          default="^(package .*;\s*)|(import .*;\s*)|( *\* *https?://.*)$"/>
-    </module>
 
     <module name="LeftCurly">
       <!-- Checks for placement of the left curly brace ('{'). -->
@@ -332,5 +313,21 @@ page at http://checkstyle.sourceforge.net/config.html -->
     </module>
 
   </module>
+
+  <module name="LineLength">
+    <!-- Checks if a line is too long. -->
+    <property name="max" value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.max}" default="100"/>
+    <property name="severity" value="error"/>
+
+    <!--
+      The default ignore pattern exempts the following elements:
+        - import statements
+        - long URLs inside comments
+    -->
+
+    <property name="ignorePattern"
+              value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.ignorePattern}"
+              default="^(package .*;\s*)|(import .*;\s*)|( *\* *https?://.*)$"/>
+  </module>
 </module>
 
diff --git a/samples/dailymotion-cmdline-sample/pom.xml b/samples/dailymotion-cmdline-sample/pom.xml
index 1638a919d..6bae78624 100644
--- a/samples/dailymotion-cmdline-sample/pom.xml
+++ b/samples/dailymotion-cmdline-sample/pom.xml
@@ -33,22 +33,6 @@
           </systemProperties>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>3.0.0</version>
-        <configuration>
-          <configLocation>../checkstyle.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>false</failOnViolation>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
@@ -102,6 +86,40 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <profiles>
+    <profile>
+      <id>checkstyle</id>
+      <activation>
+        <!-- Checkstyle plugin's dependency now requires Java 11 or higher -->
+        <jdk>[11,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <version>3.6.0</version>
+            <configuration>
+              <configLocation>../checkstyle.xml</configLocation>
+              <consoleOutput>true</consoleOutput>
+              <failOnViolation>false</failOnViolation>
+            </configuration>
+            <dependencies>
+              <dependency>
+                <groupId>com.puppycrawl.tools</groupId>
+                <artifactId>checkstyle</artifactId>
+                <version>10.21.1</version>
+              </dependency>
+            </dependencies>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <!-- By default, we release artifacts to Sonatype, which requires
           nexus-staging-maven-plugin. -->
diff --git a/samples/keycloak-pkce-cmdline-sample/pom.xml b/samples/keycloak-pkce-cmdline-sample/pom.xml
index 20b98a2cd..71f5a6b0c 100644
--- a/samples/keycloak-pkce-cmdline-sample/pom.xml
+++ b/samples/keycloak-pkce-cmdline-sample/pom.xml
@@ -33,22 +33,6 @@
           </systemProperties>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>3.0.0</version>
-        <configuration>
-          <configLocation>../checkstyle.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <failOnViolation>false</failOnViolation>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
@@ -102,6 +86,40 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <profiles>
+    <profile>
+      <id>checkstyle</id>
+      <activation>
+        <!-- Checkstyle plugin's dependency now requires Java 11 or higher -->
+        <jdk>[11,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <version>3.6.0</version>
+            <configuration>
+              <configLocation>../checkstyle.xml</configLocation>
+              <consoleOutput>true</consoleOutput>
+              <failOnViolation>false</failOnViolation>
+            </configuration>
+            <dependencies>
+              <dependency>
+                <groupId>com.puppycrawl.tools</groupId>
+                <artifactId>checkstyle</artifactId>
+                <version>10.21.1</version>
+              </dependency>
+            </dependencies>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <!-- By default, we release artifacts to Sonatype, which requires
           nexus-staging-maven-plugin. -->

From 91d89470880bec3f83340890d455a3eb9c279d99 Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Wed, 29 Jan 2025 22:18:35 -0500
Subject: [PATCH 07/12] chore: checkstyle profile "checkstyle-test" (#1144)

This profile name matches java-shared-config
https://github.com/googleapis/java-shared-config/blob/2322b789d9568a1cd8ce4efc04fa11d7ff51c178/java-shared-config/pom.xml#L505C11-L505C27
---
 pom.xml                                      | 2 +-
 samples/dailymotion-cmdline-sample/pom.xml   | 2 +-
 samples/keycloak-pkce-cmdline-sample/pom.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index fc93d091f..6861b2294 100644
--- a/pom.xml
+++ b/pom.xml
@@ -502,7 +502,7 @@
 
   <profiles>
     <profile>
-      <id>checkstyle</id>
+      <id>checkstyle-tests</id>
       <activation>
         <!-- Checkstyle plugin's dependency now requires Java 11 or higher -->
         <jdk>[11,)</jdk>
diff --git a/samples/dailymotion-cmdline-sample/pom.xml b/samples/dailymotion-cmdline-sample/pom.xml
index 6bae78624..43f0ba2e9 100644
--- a/samples/dailymotion-cmdline-sample/pom.xml
+++ b/samples/dailymotion-cmdline-sample/pom.xml
@@ -87,7 +87,7 @@
   </properties>
   <profiles>
     <profile>
-      <id>checkstyle</id>
+      <id>checkstyle-tests</id>
       <activation>
         <!-- Checkstyle plugin's dependency now requires Java 11 or higher -->
         <jdk>[11,)</jdk>
diff --git a/samples/keycloak-pkce-cmdline-sample/pom.xml b/samples/keycloak-pkce-cmdline-sample/pom.xml
index 71f5a6b0c..b1e929eed 100644
--- a/samples/keycloak-pkce-cmdline-sample/pom.xml
+++ b/samples/keycloak-pkce-cmdline-sample/pom.xml
@@ -87,7 +87,7 @@
   </properties>
   <profiles>
     <profile>
-      <id>checkstyle</id>
+      <id>checkstyle-tests</id>
       <activation>
         <!-- Checkstyle plugin's dependency now requires Java 11 or higher -->
         <jdk>[11,)</jdk>

From 490bce7d67bd6ea48ca01d50f0214b1698a2d816 Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Thu, 30 Jan 2025 18:44:02 -0500
Subject: [PATCH 08/12] fix: animal-sniffer and clirr to a profiles (#1145)

* fix: animal-sniffer-maven-plugin and clirr-maven-plugin to profiles

b/384085175#comment40. We can skip animal-sniffer-maven-plugin execution if we wrap it as a profile.

* clirr profile
---
 google-oauth-client-appengine/pom.xml |  12 ---
 google-oauth-client-java6/pom.xml     |  12 ---
 google-oauth-client-jetty/pom.xml     |  12 ---
 pom.xml                               | 104 +++++++++++++++++---------
 4 files changed, 67 insertions(+), 73 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..ba62408f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -399,43 +399,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>
-      <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 +624,72 @@
         </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>
+        <!-- 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 a700b61696e9a9f4e8dd4344df7bbced23637053 Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Fri, 14 Feb 2025 11:30:50 -0500
Subject: [PATCH 09/12] ci: Louhi release tag automation (#1146)

b/394646919. This workflow is to experiment release tagging for Louhi tag trigger.
---
 .github/workflows/louhi-tag-release.yaml | 38 ++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 .github/workflows/louhi-tag-release.yaml

diff --git a/.github/workflows/louhi-tag-release.yaml b/.github/workflows/louhi-tag-release.yaml
new file mode 100644
index 000000000..ac3d2fde8
--- /dev/null
+++ b/.github/workflows/louhi-tag-release.yaml
@@ -0,0 +1,38 @@
+name: Louhi Release Tag
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      # Permission to create tag
+      # https://docs.github.com/en/rest/authentication/permissions-required-for-github-apps?apiVersion=2022-11-28#repository-permissions-for-contents
+      contents: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set up Git
+        run: |
+          git config --local user.email "action@github.com"
+          git config --local user.name "Louhi Release Tag"
+      - name: Fetch all tags
+        run: git fetch --tags
+      - name: Create additional tags
+        shell: bash
+        run: |
+          SHA=$(git log -1 --format=format:%H)
+          PR_NUMBER=$(gh pr list --search "$SHA" --state merged --json number --jq '.[].number')
+          if [[ -z "${PR_NUMBER}" ]]; then
+            echo "Couldn't get pull request number for ${SHA}"
+            exit 1
+          fi
+          echo "PR {PR_NUMBER} for ${SHA}"
+          TAG_NAME="louhi-{PR_NUMBER}"
+          git tag $TAG_NAME
+          git push origin $TAG_NAME

From 86a8148d7b6decb8a0b18380111bf77b7e7df763 Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Fri, 14 Feb 2025 14:04:54 -0500
Subject: [PATCH 10/12] ci: passing github.token in workflow (#1147)

The workflow failed with the error message:

> gh: To use GitHub CLI in a GitHub Actions workflow, set the GH_TOKEN environment variable. Example:
>  env:
>    GH_TOKEN: ${{ github.token }}
https://github.com/googleapis/google-oauth-java-client/actions/runs/13333566853/job/37243408904
---
 .github/workflows/louhi-tag-release.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/louhi-tag-release.yaml b/.github/workflows/louhi-tag-release.yaml
index ac3d2fde8..1337778d8 100644
--- a/.github/workflows/louhi-tag-release.yaml
+++ b/.github/workflows/louhi-tag-release.yaml
@@ -25,6 +25,8 @@ jobs:
         run: git fetch --tags
       - name: Create additional tags
         shell: bash
+        env:
+          GH_TOKEN: ${{ github.token }}
         run: |
           SHA=$(git log -1 --format=format:%H)
           PR_NUMBER=$(gh pr list --search "$SHA" --state merged --json number --jq '.[].number')

From 4b65ab7aefa926fe9a977e4ed84c92e23660eddc Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Fri, 14 Feb 2025 15:07:19 -0500
Subject: [PATCH 11/12] ci: fixing typo in louhi release tag automation (#1148)

---
 .github/workflows/louhi-tag-release.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/louhi-tag-release.yaml b/.github/workflows/louhi-tag-release.yaml
index 1337778d8..2eb024e5e 100644
--- a/.github/workflows/louhi-tag-release.yaml
+++ b/.github/workflows/louhi-tag-release.yaml
@@ -34,7 +34,7 @@ jobs:
             echo "Couldn't get pull request number for ${SHA}"
             exit 1
           fi
-          echo "PR {PR_NUMBER} for ${SHA}"
-          TAG_NAME="louhi-{PR_NUMBER}"
+          echo "PR ${PR_NUMBER} for ${SHA}"
+          TAG_NAME="louhi-${PR_NUMBER}"
           git tag $TAG_NAME
           git push origin $TAG_NAME

From fa76501708bf529ae154f36d4f5957537ee65eef Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 17 Feb 2025 22:25:18 -0500
Subject: [PATCH 12/12] chore(main): release 1.38.0 (#1139)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: Tomo Suzuki <suztomo@google.com>
---
 CHANGELOG.md                                 | 13 +++++++++++++
 google-oauth-client-appengine/pom.xml        |  2 +-
 google-oauth-client-assembly/pom.xml         |  2 +-
 google-oauth-client-bom/pom.xml              | 12 ++++++------
 google-oauth-client-java6/pom.xml            |  2 +-
 google-oauth-client-jetty/pom.xml            |  2 +-
 google-oauth-client-servlet/pom.xml          |  2 +-
 google-oauth-client/pom.xml                  |  2 +-
 pom.xml                                      |  2 +-
 samples/dailymotion-cmdline-sample/pom.xml   |  2 +-
 samples/keycloak-pkce-cmdline-sample/pom.xml |  2 +-
 versions.txt                                 |  2 +-
 12 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5ea4b3ab..f1e90108c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [1.38.0](https://github.com/googleapis/google-oauth-java-client/compare/v1.37.0...v1.38.0) (2025-02-14)
+
+
+### Bug Fixes
+
+* Animal-sniffer and clirr to a profiles ([#1145](https://github.com/googleapis/google-oauth-java-client/issues/1145)) ([490bce7](https://github.com/googleapis/google-oauth-java-client/commit/490bce7d67bd6ea48ca01d50f0214b1698a2d816))
+* Javadoc fix in IdTokenVerifier ([#1134](https://github.com/googleapis/google-oauth-java-client/issues/1134)) ([9ff0f6b](https://github.com/googleapis/google-oauth-java-client/commit/9ff0f6bc57e4449f2877d3a3d5ac8e8adbc326e9))
+
+
+### Dependencies
+
+* Newer Maven plugin versions for Airlock ([#1140](https://github.com/googleapis/google-oauth-java-client/issues/1140)) ([11a8fca](https://github.com/googleapis/google-oauth-java-client/commit/11a8fca5203bde8721915dd57fef0094015ca51e))
+
 ## [1.37.0](https://github.com/googleapis/google-oauth-java-client/compare/v1.36.0...v1.37.0) (2024-12-11)
 
 
diff --git a/google-oauth-client-appengine/pom.xml b/google-oauth-client-appengine/pom.xml
index 0a3cde176..8fa8914ea 100644
--- a/google-oauth-client-appengine/pom.xml
+++ b/google-oauth-client-appengine/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.oauth-client</groupId>
     <artifactId>google-oauth-client-parent</artifactId>
-    <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
+    <version>1.38.0</version><!-- {x-version-update:google-oauth-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-oauth-client-appengine</artifactId>
diff --git a/google-oauth-client-assembly/pom.xml b/google-oauth-client-assembly/pom.xml
index 49938967c..ad02b32b6 100644
--- a/google-oauth-client-assembly/pom.xml
+++ b/google-oauth-client-assembly/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.oauth-client</groupId>
     <artifactId>google-oauth-client-parent</artifactId>
-    <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
+    <version>1.38.0</version><!-- {x-version-update:google-oauth-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>com.google.oauth-client</groupId>
diff --git a/google-oauth-client-bom/pom.xml b/google-oauth-client-bom/pom.xml
index 10ddbd7c1..7e396e35f 100644
--- a/google-oauth-client-bom/pom.xml
+++ b/google-oauth-client-bom/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.oauth-client</groupId>
   <artifactId>google-oauth-client-bom</artifactId>
-  <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
+  <version>1.38.0</version><!-- {x-version-update:google-oauth-client:current} -->
   <packaging>pom</packaging>
 
   <name>Google OAuth Client Library for Java BOM</name>
@@ -63,27 +63,27 @@
       <dependency>
         <groupId>com.google.oauth-client</groupId>
         <artifactId>google-oauth-client</artifactId>
-        <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
+        <version>1.38.0</version><!-- {x-version-update:google-oauth-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.oauth-client</groupId>
         <artifactId>google-oauth-client-appengine</artifactId>
-        <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
+        <version>1.38.0</version><!-- {x-version-update:google-oauth-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.oauth-client</groupId>
         <artifactId>google-oauth-client-java6</artifactId>
-        <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
+        <version>1.38.0</version><!-- {x-version-update:google-oauth-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.oauth-client</groupId>
         <artifactId>google-oauth-client-jetty</artifactId>
-        <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
+        <version>1.38.0</version><!-- {x-version-update:google-oauth-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.oauth-client</groupId>
         <artifactId>google-oauth-client-servlet</artifactId>
-        <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
+        <version>1.38.0</version><!-- {x-version-update:google-oauth-client:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/google-oauth-client-java6/pom.xml b/google-oauth-client-java6/pom.xml
index 49faaf0de..925a82dd1 100644
--- a/google-oauth-client-java6/pom.xml
+++ b/google-oauth-client-java6/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.oauth-client</groupId>
     <artifactId>google-oauth-client-parent</artifactId>
-    <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
+    <version>1.38.0</version><!-- {x-version-update:google-oauth-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-oauth-client-java6</artifactId>
diff --git a/google-oauth-client-jetty/pom.xml b/google-oauth-client-jetty/pom.xml
index 77e17aeee..5b22ac456 100644
--- a/google-oauth-client-jetty/pom.xml
+++ b/google-oauth-client-jetty/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.oauth-client</groupId>
     <artifactId>google-oauth-client-parent</artifactId>
-    <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
+    <version>1.38.0</version><!-- {x-version-update:google-oauth-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-oauth-client-jetty</artifactId>
diff --git a/google-oauth-client-servlet/pom.xml b/google-oauth-client-servlet/pom.xml
index 623955b9a..75be51b5f 100644
--- a/google-oauth-client-servlet/pom.xml
+++ b/google-oauth-client-servlet/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.oauth-client</groupId>
     <artifactId>google-oauth-client-parent</artifactId>
-    <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
+    <version>1.38.0</version><!-- {x-version-update:google-oauth-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-oauth-client-servlet</artifactId>
diff --git a/google-oauth-client/pom.xml b/google-oauth-client/pom.xml
index 54a2e4cef..e17fd7c2d 100644
--- a/google-oauth-client/pom.xml
+++ b/google-oauth-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.oauth-client</groupId>
     <artifactId>google-oauth-client-parent</artifactId>
-    <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
+    <version>1.38.0</version><!-- {x-version-update:google-oauth-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-oauth-client</artifactId>
diff --git a/pom.xml b/pom.xml
index ba62408f7..6e6c0ab2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>com.google.oauth-client</groupId>
   <artifactId>google-oauth-client-parent</artifactId>
-  <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
+  <version>1.38.0</version><!-- {x-version-update:google-oauth-client:current} -->
   <packaging>pom</packaging>
   <name>Parent for the Google OAuth Client Library for Java</name>
   <description>Google OAuth Client Library for Java</description>
diff --git a/samples/dailymotion-cmdline-sample/pom.xml b/samples/dailymotion-cmdline-sample/pom.xml
index 43f0ba2e9..ca377a3b9 100644
--- a/samples/dailymotion-cmdline-sample/pom.xml
+++ b/samples/dailymotion-cmdline-sample/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.oauth-client</groupId>
     <artifactId>google-oauth-client-parent</artifactId>
-    <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
+    <version>1.38.0</version><!-- {x-version-update:google-oauth-client:current} -->
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>dailymotion-simple-cmdline-sample</artifactId>
diff --git a/samples/keycloak-pkce-cmdline-sample/pom.xml b/samples/keycloak-pkce-cmdline-sample/pom.xml
index b1e929eed..2308b530a 100644
--- a/samples/keycloak-pkce-cmdline-sample/pom.xml
+++ b/samples/keycloak-pkce-cmdline-sample/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.oauth-client</groupId>
     <artifactId>google-oauth-client-parent</artifactId>
-    <version>1.38.0-SNAPSHOT</version><!-- {x-version-update:google-oauth-client:current} -->
+    <version>1.38.0</version><!-- {x-version-update:google-oauth-client:current} -->
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>keycloak-pkce-cmdline-sample</artifactId>
diff --git a/versions.txt b/versions.txt
index c4efb152b..057190025 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
 # Format:
 # module:released-version:current-version
 
-google-oauth-client:1.37.0:1.38.0-SNAPSHOT
+google-oauth-client:1.38.0:1.38.0