Merge branch 'x509' into x509-java

Author: aeitzman

.github/workflows/members.json

@@ -0,0 +1,19 @@
+[
+{"login":"renovate-bot"},
+{"login":"release-please"},
+{"login":"suztomo"},
+{"login":"dangazineu"},
+{"login":"ldetmer"},
+{"login":"zhumin8"},
+{"login":"blakeli0"},
+{"login":"lqiu96"},
+{"login":"jinseopkim0"},
+{"login":"meltsufin"},
+{"login":"diegomarquezp"},
+{"login":"burkedavison"},
+{"login":"mpeddada1"},
+{"login":"JoeWang1127"},
+{"login":"kmaydeo"},
+{"login":"lsirac"},
+{"login":"aeitzman"}
+]

.github/workflows/multi_approvers.yaml

@@ -0,0 +1,31 @@
+name: 'multi-approvers'
+
+on:
+  pull_request:
+    types:
+      - 'opened'
+      - 'edited'
+      - 'reopened'
+      - 'synchronize'
+      - 'ready_for_review'
+      - 'review_requested'
+      - 'review_request_removed'
+  pull_request_review:
+    types:
+      - 'submitted'
+      - 'dismissed'
+
+permissions:
+  actions: 'write'
+  contents: 'read'
+  pull-requests: 'read'
+
+concurrency:
+  group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+jobs:
+  multi-approvers:
+    uses: 'abcxyz/pkg/.github/workflows/multi-approvers.yml@main'
+    with:
+      org-members-path: '.github/workflows/members.json'

.github/workflows/sonar.yaml

@@ -9,6 +9,8 @@ jobs:
   build:
     name: Build
     runs-on: ubuntu-22.04
+    # Sonar Token can't be passed to PRs from forks. Disable Sonar workflow unless PR is from a branch.
+    if: github.event.pull_request.head.repo.full_name == github.repository
     steps:
     - uses: actions/checkout@v4
       with:
@@ -39,7 +41,6 @@ jobs:
             -DenableFullTestCoverage \
             -Dsonar.coverage.jacoco.xmlReportPaths=oauth2_http/target/site/jacoco/jacoco.xml \
             org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
-            -Pcoverage \
             -Dsonar.projectKey=googleapis_google-auth-library-java \
             -Dsonar.organization=googleapis \
-            -Dsonar.host.url=https://sonarcloud.io
+            -Dsonar.host.url=https://sonarcloud.io

.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.12.0"
+  docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:1.13.0"
 }
 

.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.12.0"
+  docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:1.13.0"
 }

.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+  ".": "1.30.1"
+}

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.30.1](https://github.com/googleapis/google-auth-library-java/compare/v1.30.0...v1.30.1) (2024-12-11)
+
+
+### Bug Fixes
+
+* JSON parsing of S2A addresses. ([#1589](https://github.com/googleapis/google-auth-library-java/issues/1589)) ([9d5ebfe](https://github.com/googleapis/google-auth-library-java/commit/9d5ebfe8870a11d27af3a7c7f3fd9930ab207162))
+
 ## [1.30.0](https://github.com/googleapis/google-auth-library-java/compare/v1.29.0...v1.30.0) (2024-11-08)
 
 

README.md

@@ -50,35 +50,92 @@ credentials as well as utility methods to create them and to get Application Def
 
 ## 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:
+
+[//]: # ({x-version-update-start:google-auth-library-bom:released})
+```xml
+<dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>com.google.cloud</groupId>
+      <artifactId>libraries-bom</artifactId>
+      <version>26.53.0</version>
+      <type>pom</type>
+      <scope>import</scope>
+    </dependency>
+  </dependencies>
+</dependencyManagement>
+```
+
+Otherwise, if you don't plan using libraries-bom, see the next section on 
+_Google Auth Library Bill of Materials_.
+
+### Using Maven
+
+#### 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:
+
+[//]: # ({x-version-update-start:google-auth-library-bom:released})
+```xml
+<dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>com.google.auth</groupId>
+      <artifactId>google-auth-library-bom</artifactId>
+      <version>1.30.1</version>
+      <type>pom</type>
+      <scope>import</scope>
+    </dependency>
+  </dependencies>
+</dependencyManagement>
+```
+[//]: # ({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):
 
-[//]: # ({x-version-update-start:google-auth-library-oauth2-http:released})
-
 ```xml
 <dependency>
   <groupId>com.google.auth</groupId>
+  <!-- Let the BOM manage the module and dependency versions -->
+  <!-- Replace with the module(s) that are needed -->
   <artifactId>google-auth-library-oauth2-http</artifactId>
-  <version>1.19.0</version>
 </dependency>
 ```
-[//]: # ({x-version-update-end})
-
 
+### Using Gradle
 If you are using Gradle, add this to your dependencies
 
-[//]: # ({x-version-update-start:google-auth-library-oauth2-http:released})
+[//]: # ({x-version-update-start:google-auth-library-bom:released})
 ```Groovy
-implementation 'com.google.auth:google-auth-library-oauth2-http:1.19.0'
+dependencies {
+    // The BOM will manage the module versions and transitive dependencies
+    implementation platform('com.google.auth:google-auth-library-bom:1.30.1')
+    // Replace with the module(s) that are needed
+    implementation 'com.google.auth:google-auth-library-oauth2-http'
+}
+
 ```
 [//]: # ({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.
 If you are using SBT, add this to your dependencies
 
 [//]: # ({x-version-update-start:google-auth-library-oauth2-http:released})
 ```Scala
-libraryDependencies += "com.google.auth" % "google-auth-library-oauth2-http" % "1.19.0"
+// Replace this with the implementation module that suits your needs
+libraryDependencies += "com.google.auth" % "google-auth-library-oauth2-http" % "1.30.1"
 ```
 [//]: # ({x-version-update-end})
 

appengine/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.google.auth</groupId>
     <artifactId>google-auth-library-parent</artifactId>
-    <version>1.30.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
+    <version>1.30.2-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.30.1-SNAPSHOT</version><!-- {x-version-update:google-auth-library-bom:current} -->
+  <version>1.30.2-SNAPSHOT</version><!-- {x-version-update:google-auth-library-bom:current} -->
   <packaging>pom</packaging>
   <name>Google Auth Library for Java BOM</name>
   <description>
@@ -83,7 +83,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.11.1</version>
+        <version>3.11.2</version>
         <configuration>
           <skip>true</skip>
         </configuration>