Merge branch 'main' into api-keys

.cloudbuild/graalvm/cloudbuild-test-a-downstream-kms.yaml

@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.11.1'
+  _JAVA_SHARED_CONFIG_VERSION: '1.11.2'
 options:
   machineType: 'E2_HIGHCPU_8'
 steps:

.cloudbuild/graalvm/cloudbuild-test-a-downstream-kmsinventory.yaml

@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.11.1'
+  _JAVA_SHARED_CONFIG_VERSION: '1.11.2'
 options:
   machineType: 'E2_HIGHCPU_8'
 steps:

.cloudbuild/graalvm/cloudbuild-test-a.yaml

@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.35.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.11.1'
+  _JAVA_SHARED_CONFIG_VERSION: '1.11.2'
 options:
   machineType: 'E2_HIGHCPU_8'
 steps:

.cloudbuild/graalvm/cloudbuild-test-b-downstream-kms.yaml

@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.11.1'
+  _JAVA_SHARED_CONFIG_VERSION: '1.11.2'
 options:
   machineType: 'E2_HIGHCPU_8'
 steps:

.cloudbuild/graalvm/cloudbuild-test-b-downstream-kmsinventory.yaml

@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.11.1'
+  _JAVA_SHARED_CONFIG_VERSION: '1.11.2'
 options:
   machineType: 'E2_HIGHCPU_8'
 steps:

.cloudbuild/graalvm/cloudbuild-test-b.yaml

@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.35.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.11.1'
+  _JAVA_SHARED_CONFIG_VERSION: '1.11.2'
 options:
   machineType: 'E2_HIGHCPU_8'
 steps:

.cloudbuild/graalvm/cloudbuild.yaml

@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.35.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.11.1'
+  _JAVA_SHARED_CONFIG_VERSION: '1.11.2'
 steps:
   # GraalVM A build
   - name: gcr.io/cloud-builders/docker

.cloudbuild/library_generation/library_generation.Dockerfile

@@ -33,7 +33,7 @@ SHELL [ "/bin/bash", "-c" ]
 
 
 ARG OWLBOT_CLI_COMMITTISH=ac84fa5c423a0069bbce3d2d869c9730c8fdf550
-ARG PROTOC_VERSION=25.4
+ARG PROTOC_VERSION=25.5
 ARG GRPC_VERSION=1.66.0
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"

.github/scripts/hermetic_library_generation.sh

@@ -84,16 +84,29 @@ git show "${target_branch}":"${generation_config}" > "${baseline_generation_conf
 # get .m2 folder so it's mapped into the docker container
 m2_folder=$(dirname "$(mvn help:evaluate -Dexpression=settings.localRepository -q -DforceStdout)")
 
+# download api definitions from googleapis repository
+googleapis_commitish=$(grep googleapis_commitish "${generation_config}" | cut -d ":" -f 2 | xargs)
+api_def_dir=$(mktemp -d)
+git clone https://github.com/googleapis/googleapis.git "${api_def_dir}"
+pushd "${api_def_dir}"
+git checkout "${googleapis_commitish}"
+popd
+
 # run hermetic code generation docker image.
 docker run \
   --rm \
   -u "$(id -u):$(id -g)" \
   -v "$(pwd):${workspace_name}" \
   -v "${m2_folder}":/home/.m2 \
+  -v "${api_def_dir}:${workspace_name}/googleapis" \
   -e GENERATOR_VERSION="${image_tag}" \
   gcr.io/cloud-devrel-public-resources/java-library-generation:"${image_tag}" \
   --baseline-generation-config-path="${workspace_name}/${baseline_generation_config}" \
-  --current-generation-config-path="${workspace_name}/${generation_config}"
+  --current-generation-config-path="${workspace_name}/${generation_config}" \
+  --api-definitions-path="${workspace_name}/googleapis"
+
+# remove api definitions after generation
+rm -rf "${api_def_dir}"
 
 # commit the change to the pull request.
 rm -rdf output googleapis "${baseline_generation_config}"

gapic-generator-java-pom-parent/pom.xml

@@ -15,7 +15,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.11.1</version>
+    <version>1.11.2</version>
     <relativePath/>
   </parent>
 
@@ -27,16 +27,16 @@
         consistent across modules in this repository -->
     <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
     <grpc.version>1.66.0</grpc.version>
-    <google.auth.version>1.25.0</google.auth.version>
+    <google.auth.version>1.27.0</google.auth.version>
     <google.http-client.version>1.45.0</google.http-client.version>
     <gson.version>2.11.0</gson.version>
     <guava.version>33.3.0-jre</guava.version>
-    <protobuf.version>3.25.4</protobuf.version>
+    <protobuf.version>3.25.5</protobuf.version>
     <opentelemetry.version>1.42.1</opentelemetry.version>
     <maven.compiler.release>8</maven.compiler.release>
     <errorprone.version>2.32.0</errorprone.version>
     <j2objc-annotations.version>3.0.0</j2objc-annotations.version>
-    <threetenbp.version>1.6.9</threetenbp.version>
+    <threetenbp.version>1.7.0</threetenbp.version>
     <junit.version>5.11.0</junit.version>
   </properties>
 

gax-java/dependencies.properties

@@ -26,7 +26,7 @@ version.gax_httpjson=2.53.1-SNAPSHOT
 # The protobuf version is only used for generating gradle files for showcase module,
 # not for self-service clients (from googleapis project).
 
-version.com_google_protobuf=3.25.4
+version.com_google_protobuf=3.25.5
 version.google_java_format=1.15.0
 version.io_grpc=1.66.0
 
@@ -37,8 +37,8 @@ version.io_grpc=1.66.0
 #   2) Replace all characters which are neither alphabetic nor digits with the underscore ('_') character
 maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.44.0
 maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.44.0
-maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.25.0
-maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.25.0
+maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.27.0
+maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.27.0
 maven.io_opentelemetry_opentelemetry_api=io.opentelemetry:opentelemetry-api:1.42.1
 maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.31.1
 maven.io_opencensus_opencensus_contrib_grpc_metrics=io.opencensus:opencensus-contrib-grpc-metrics:0.31.1
@@ -68,7 +68,7 @@ maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:
 maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.11.0
 maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.11.0
 maven.com_google_api_api_common=com.google.api:api-common:2.36.0
-maven.org_threeten_threetenbp=org.threeten:threetenbp:1.6.9
+maven.org_threeten_threetenbp=org.threeten:threetenbp:1.7.0
 maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.39.0
 maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.39.0
 maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.45.0

gax-java/gax-bom/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.11.1</version>
+    <version>1.11.2</version>
     <relativePath/>
   </parent>
 

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Advice.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/config_change.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 /**

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AdviceOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/config_change.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 public interface AdviceOrBuilder

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AnnotationsProto.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/annotations.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 public final class AnnotationsProto {

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthProto.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/auth.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 public final class AuthProto {

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthProvider.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/auth.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 /**

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthProviderOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/auth.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 public interface AuthProviderOrBuilder

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthRequirement.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/auth.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 /**

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthRequirementOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/auth.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 public interface AuthRequirementOrBuilder

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Authentication.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/auth.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 /**

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthenticationOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/auth.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 public interface AuthenticationOrBuilder

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthenticationRule.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/auth.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 /**

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/AuthenticationRuleOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/auth.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 public interface AuthenticationRuleOrBuilder

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Backend.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/backend.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 /**

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BackendOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/backend.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 public interface BackendOrBuilder

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BackendProto.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/backend.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 public final class BackendProto {

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BackendRule.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/backend.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 /**

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BackendRuleOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/backend.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 public interface BackendRuleOrBuilder

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Billing.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/billing.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 /**

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BillingOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/billing.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 public interface BillingOrBuilder

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/BillingProto.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/billing.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 public final class BillingProto {

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ChangeType.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/config_change.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 /**

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientLibraryDestination.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 /**

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientLibraryOrganization.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 /**

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientLibrarySettings.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 /**

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientLibrarySettingsOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/api/client.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.api;
 
 public interface ClientLibrarySettingsOrBuilder