Merge branch 'main' into multi-approvers

Author: meltsufin

.github/workflows/members.json

@@ -1,6 +1,11 @@
 [
 {"login":"renovate-bot"},
-{"login":"release-please"},
+{"login":"release-please[bot]"},
+{"login":"cloud-java-bot"},
+{"login":"gcf-owl-bot[bot]"},
+{"login":"dependabot[bot]"},
+{"login":"yoshi-code-bot"},
+{"login":"yoshi-automation"},
 {"login":"suztomo"},
 {"login":"dangazineu"},
 {"login":"ldetmer"},
@@ -21,5 +26,103 @@
 {"login":"surbhigarg92"},
 {"login":"alkatrivedi"},
 {"login":"olavloite"},
-{"login":"harshachinta"}
+{"login":"harshachinta"},
+{"login":"dazuma"},
+{"login":"quartzmo"},
+{"login":"codyoss"},
+{"login":"BrennaEpp"},
+{"login":"tritone"},
+{"login":"bisun-google"},
+{"login":"linchin"},
+{"login":"ohmayr"},
+{"login":"parthea"},
+{"login":"vchudnov-g"},
+{"login":"scotthart"},
+{"login":"dbolduc"},
+{"login":"cuiy0006"},
+{"login":"andrewsg"},
+{"login":"BenWhitehead"},
+{"login":"danielduhh"},
+{"login":"vishwarajanand"},
+{"login":"bajajneha27"},
+{"login":"JesseLovelace"},
+{"login":"cojenco"},
+{"login":"ddelgrosso1"},
+{"login":"sydney-munro"},
+{"login":"marcoa6"},
+{"login":"jskeet"},
+{"login":"glaforge"},
+{"login":"cwest"},
+{"login":"engelke"},
+{"login":"fhinkel"},
+{"login":"briandorsey"},
+{"login":"palladius"},
+{"login":"callingshotgun"},
+{"login":"muncus"},
+{"login":"darylducharme"},
+{"login":"grayside"},
+{"login":"koverholt"},
+{"login":"wietsevenema"},
+{"login":"ankurkotwal"},
+{"login":"ksprashu"},
+{"login":"arbrown"},
+{"login":"momander"},
+{"login":"donmccasland"},
+{"login":"glasnt"},
+{"login":"rsamborski"},
+{"login":"meteatamel"},
+{"login":"iennae"},
+{"login":"rominirani"},
+{"login":"kazunori279"},
+{"login":"davidcavazos"},
+{"login":"bourgeoisor"},
+{"login":"minherz"},
+{"login":"vladkol"},
+{"login":"kaslin"},
+{"login":"LukeSchlangen"},
+{"login":"billyjacobson"},
+{"login":"msampathkumar"},
+{"login":"polong-lin"},
+{"login":"villasenor"},
+{"login":"alphinside"},
+{"login":"telpirion"},
+{"login":"ZackAkil"},
+{"login":"joeshirey"},
+{"login":"m-strzelczyk"},
+{"login":"NimJay"},
+{"login":"saraford"},
+{"login":"kweinmeister"},
+{"login":"Mukamik"},
+{"login":"holtskinner"},
+{"login":"Neenu1995"},
+{"login":"Deleplace"},
+{"login":"Sita04"},
+{"login":"AbiramiSukumaran"},
+{"login":"moficodes"},
+{"login":"amanda-tarafa"},
+{"login":"aliciawilliams"},
+{"login":"jeffonelson"},
+{"login":"GabeWeiss"},
+{"login":"h3xar0n"},
+{"login":"katiemn"},
+{"login":"iamthuya"},
+{"login":"bradmiro"},
+{"login":"PicardParis"},
+{"login":"gotochkin"},
+{"login":"jesuispy"},
+{"login":"hyunuk"},
+{"login":"rachael-ds"},
+{"login":"eaball35"},
+{"login":"alokpattani"},
+{"login":"dandhlee"},
+{"login":"duncantech"},
+{"login":"inardini"},
+{"login":"lavinigam-gcp"},
+{"login":"gericdong"},
+{"login":"priyapandeyb"},
+{"login":"erwinh85"},
+{"login":"CadillacBurgess1"},
+{"login":"julieqiu"},
+{"login":"coryan"},
+{"login":"devoncarew"}
 ]

.kokoro/presubmit/graalvm-native-a.cfg

@@ -44,6 +44,6 @@ env_vars: {
 }
 
 container_properties {
-  docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:1.14.0"
+  docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:1.14.2"
 }
 

.kokoro/presubmit/graalvm-native-b.cfg

@@ -44,5 +44,5 @@ env_vars: {
 }
 
 container_properties {
-  docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:1.14.0"
+  docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:1.14.2"
 }

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "1.31.0"
+  ".": "1.32.0"
 }

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [1.32.0](https://github.com/googleapis/google-auth-library-java/compare/v1.31.0...v1.32.0) (2025-02-04)
+
+
+### Features
+
+* Introduce Client-Side Credential Access Boundary (CAB) functionality ([#1629](https://github.com/googleapis/google-auth-library-java/issues/1629)) ([f481123](https://github.com/googleapis/google-auth-library-java/commit/f4811236018502595987eea8ce5f3fa1c7fdbfaf))
+
+
+### Bug Fixes
+
+* Handle 404 and non 200 Status Code from MDS Identity Token calls ([#1636](https://github.com/googleapis/google-auth-library-java/issues/1636)) ([152c851](https://github.com/googleapis/google-auth-library-java/commit/152c851bfb90196437f268a6975e66a89985444b))
+* Respect token_uri from json in UserCredentials creation. ([#1630](https://github.com/googleapis/google-auth-library-java/issues/1630)) ([f92cc4f](https://github.com/googleapis/google-auth-library-java/commit/f92cc4faf46ab6b0b2b5659fdbbd4c83c1c2f0fe))
+
+
+### Documentation
+
+* Re-organize the README + Add a section on migrating to GoogleCredentials ([#1644](https://github.com/googleapis/google-auth-library-java/issues/1644)) ([30b26b2](https://github.com/googleapis/google-auth-library-java/commit/30b26b280268530eb46fb85baa1ca808245e8d26))
+
 ## [1.31.0](https://github.com/googleapis/google-auth-library-java/compare/v1.30.1...v1.31.0) (2025-01-22)
 
 

README.md

@@ -25,7 +25,13 @@ information, refer to [documentation](https://cloud.google.com/docs/authenticati
 
 
 * [Quickstart](#quickstart)
-
+  * [Importing the Auth Library](#importing-the-auth-library)
+    * [Preferred: Libraries-Bom](#java-sdk-libraries-bom)
+    * [Auth-Bom](#google-auth-library-bill-of-materials)
+      * [Maven](#maven)
+      * [Gradle](#gradle)
+      * [Scala](#scala)
+  * [Migrating from GoogleCredential to GoogleCredentials](#migrating-from-googlecredential-to-googlecredentials)
 * [google-auth-library-oauth2-http](#google-auth-library-oauth2-http)
   * [Application Default Credentials](#application-default-credentials)
   * [ImpersonatedCredentials](#impersonatedcredentials)
@@ -55,10 +61,14 @@ information, refer to [documentation](https://cloud.google.com/docs/authenticati
 
 ## Quickstart
 
-### Preferred method: using `java-libraries-bom`
-If your use case is to enable authentication for a GAPIC library such as `google-cloud-datastore`,
-you may want simply add `libraries-bom`, which automatically imports the auth bom, to your pom.xml
-as follows:
+### Importing the Auth Library
+
+#### Java SDK Libraries-Bom
+If you are trying to authenticate to a client library in the Java SDK (i.e. `google-cloud-datastore`),
+you can import add `libraries-bom` to manage the versions of your dependencies. The BOM will pull in the
+versions of Auth Library compatible with the client library.
+
+For example, importing with Maven from a pom.xml:
 
 [//]: # ({x-version-update-start:google-auth-library-bom:released})
 ```xml
@@ -75,15 +85,16 @@ as follows:
 </dependencyManagement>
 ```
 
-Otherwise, if you don't plan using libraries-bom, see the next section on 
-_Google Auth Library Bill of Materials_.
-
-### Using Maven
+If you don't plan using libraries-bom or the client libraries, see the next section on 
+[Google Auth Library Bill of Materials](#google-auth-library-bill-of-materials) to just import the relevant
+Auth modules.
 
 #### Google Auth Library Bill of Materials
-In order to ensure transitive dependencies and the modules themselves are aligned with each other,
-we rely on the Google Auth Library Bill of Materials. Please add this to your dependency management
-section as follows:
+Alternatively, you can use the Google Auth Library Bill of Materials to ensure that the Auth modules
+and relevant transitive dependencies are compatible.
+
+##### Maven
+Add the following your pom.xml file
 
 [//]: # ({x-version-update-start:google-auth-library-bom:released})
 ```xml
@@ -101,11 +112,9 @@ section as follows:
 ```
 [//]: # ({x-version-update-end})
 
-#### Choosing your implementation
-
-If you are using Maven, add this to your pom.xml file (notice that you can replace
-`google-auth-library-oauth2-http` with any of `google-auth-library-credentials` and
-`google-auth-library-appengine`, depending on your application needs):
+In the `<dependency>` section, you can specify any of the Auth modules that are needed.
+For example, replace `google-auth-library-oauth2-http` below with any of `google-auth-library-credentials`
+and `google-auth-library-appengine`, depending on your application needs):
 
 ```xml
 <dependency>
@@ -116,8 +125,8 @@ If you are using Maven, add this to your pom.xml file (notice that you can repla
 </dependency>
 ```
 
-### Using Gradle
-If you are using Gradle, add this to your dependencies
+##### Gradle
+Add the following to your build.gradle file and specify any modules needed.
 
 [//]: # ({x-version-update-start:google-auth-library-bom:released})
 ```Groovy
@@ -131,10 +140,11 @@ dependencies {
 ```
 [//]: # ({x-version-update-end})
 
-Unfortunately, SBT [cannot](https://github.com/sbt/sbt/issues/4531) manage dependencies via Maven
-Bills of Materials. Therefore, you will have to add the submodule directly. Make sure the module
-versions are aligned in case you are using more than one authentication module in order to prevent
-transitive dependency conflicts.
+##### Scala
+Unfortunately, SBT [cannot](https://github.com/sbt/sbt/issues/4531) manage dependencies via Maven Bills of Materials. You will have to
+add the submodule directly. Make sure the module versions are aligned in case you are using more than
+one authentication module in order to prevent transitive dependency conflicts.
+
 If you are using SBT, add this to your dependencies
 
 [//]: # ({x-version-update-start:google-auth-library-oauth2-http:released})
@@ -144,6 +154,19 @@ libraryDependencies += "com.google.auth" % "google-auth-library-oauth2-http" % "
 ```
 [//]: # ({x-version-update-end})
 
+### Migrating from GoogleCredential to GoogleCredentials
+[GoogleCredential](https://cloud.google.com/java/docs/reference/google-api-client/latest/com.google.api.client.googleapis.auth.oauth2.GoogleCredential)
+from google-api-java-client is deprecated and GoogleCredentials is the recommended replacement.
+
+We recommend users to instantiate GoogleCredentials with [Application Default Credentials (ADC)](#application-default-credentials):
+`GoogleCredentials credentials = GoogleCredentials.getApplicationDefault();`
+
+For [Google Api Client Library](https://cloud.google.com/apis/docs/client-libraries-explained#google-api-client-libraries) users, please refer to this
+[guide](https://developers.google.com/api-client-library/java/google-api-java-client/requests) for a example to instantiate a library with GoogleCredentials.
+
+For [Cloud Client Libraries](https://cloud.google.com/apis/docs/client-libraries-explained#cloud-client-libraries), the library will follow ADC to create a 
+default GoogleCredential. Users do not need to manually create any Credentials or pass it into the library.
+
 ## google-auth-library-oauth2-http
 
 ### Application Default Credentials

appengine/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.google.auth</groupId>
     <artifactId>google-auth-library-parent</artifactId>
-    <version>1.31.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
+    <version>1.32.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
 

bom/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.auth</groupId>
   <artifactId>google-auth-library-bom</artifactId>
-  <version>1.31.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library-bom:current} -->
+  <version>1.32.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library-bom:current} -->
   <packaging>pom</packaging>
   <name>Google Auth Library for Java BOM</name>
   <description>