chore: merge main into generate-libraries-main

Author: cloud-java-bot

.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.12.0'
+  _JAVA_SHARED_CONFIG_VERSION: '1.12.2'
 options:
   machineType: 'E2_HIGHCPU_8'
   logging: CLOUD_LOGGING_ONLY

.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.12.0'
+  _JAVA_SHARED_CONFIG_VERSION: '1.12.2'
 options:
   machineType: 'E2_HIGHCPU_8'
   logging: CLOUD_LOGGING_ONLY

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

@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.40.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.12.0'
+  _JAVA_SHARED_CONFIG_VERSION: '1.12.2'
 options:
   machineType: 'E2_HIGHCPU_8'
   logging: CLOUD_LOGGING_ONLY

.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.12.0'
+  _JAVA_SHARED_CONFIG_VERSION: '1.12.2'
 options:
   machineType: 'E2_HIGHCPU_8'
   logging: CLOUD_LOGGING_ONLY

.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.12.0'
+  _JAVA_SHARED_CONFIG_VERSION: '1.12.2'
 options:
   machineType: 'E2_HIGHCPU_8'
   logging: CLOUD_LOGGING_ONLY

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

@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.40.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.12.0'
+  _JAVA_SHARED_CONFIG_VERSION: '1.12.2'
 options:
   machineType: 'E2_HIGHCPU_8'
   logging: CLOUD_LOGGING_ONLY

.cloudbuild/graalvm/cloudbuild.yaml

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

.cloudbuild/library_generation/library_generation.Dockerfile

@@ -51,7 +51,7 @@ FROM docker.io/library/python:3.13.1-alpine3.20@sha256:804ad02b9ba67ea1f8307eeb6
 
 ARG OWLBOT_CLI_COMMITTISH=6662ddc9cff57289c3c1d59224904d78087734b5
 ARG PROTOC_VERSION=25.5
-ARG GRPC_VERSION=1.68.2
+ARG GRPC_VERSION=1.69.0
 ARG JAVA_FORMAT_VERSION=1.7
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"

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.12.0</version>
+    <version>1.12.2</version>
     <relativePath/>
   </parent>
 
@@ -26,7 +26,7 @@
     <!-- External dependencies, especially gRPC and Protobuf version, should be
         consistent across modules in this repository -->
     <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
-    <grpc.version>1.68.2</grpc.version>
+    <grpc.version>1.69.0</grpc.version>
     <google.auth.version>1.30.0</google.auth.version>
     <google.http-client.version>1.45.2</google.http-client.version>
     <gson.version>2.11.0</gson.version>

gax-java/dependencies.properties

@@ -28,7 +28,7 @@ version.gax_httpjson=2.58.1-SNAPSHOT
 
 version.com_google_protobuf=3.25.5
 version.google_java_format=1.15.0
-version.io_grpc=1.68.2
+version.io_grpc=1.69.0
 
 # Maven artifacts.
 # Note, the actual name of each property matters (bazel build scripts depend on it).