Merge branch 'main' into renovate/migrate-config

Author: lqiu96

.bazeliskrc

@@ -1,3 +1,3 @@
 # See https://github.com/bazelbuild/bazelisk
 # Version required for Java 24 support (https://github.com/bazelbuild/bazel/commit/806a6e82320956b63f1351ebe2b0da8483f36f19).
-USE_BAZEL_VERSION=7.6.1
+USE_BAZEL_VERSION=7.7.0

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

@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _SHARED_DEPENDENCIES_VERSION: '3.54.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
+  _SHARED_DEPENDENCIES_VERSION: '3.56.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
   _JAVA_SHARED_CONFIG_VERSION: '1.17.0'
 options:
   machineType: 'E2_HIGHCPU_8'

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

@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _SHARED_DEPENDENCIES_VERSION: '3.54.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
+  _SHARED_DEPENDENCIES_VERSION: '3.56.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
   _JAVA_SHARED_CONFIG_VERSION: '1.17.0'
 options:
   machineType: 'E2_HIGHCPU_8'

.cloudbuild/graalvm/cloudbuild-test-c.yaml

@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _SHARED_DEPENDENCIES_VERSION: '3.54.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
+  _SHARED_DEPENDENCIES_VERSION: '3.56.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
   _JAVA_SHARED_CONFIG_VERSION: '1.17.0'
 options:
   machineType: 'E2_HIGHCPU_8'

.cloudbuild/graalvm/cloudbuild.yaml

@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _SHARED_DEPENDENCIES_VERSION: '3.54.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
+  _SHARED_DEPENDENCIES_VERSION: '3.56.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
   _JAVA_SHARED_CONFIG_VERSION: '1.17.0'
 steps:
   # GraalVM A build

.cloudbuild/library_generation/cloudbuild-library-generation-integration-test.yaml

@@ -20,6 +20,8 @@ steps:
   args: [
       "build",
       "--no-cache",
+      # Use a fixed protoc version so that the generation result stays the same
+      "--build-arg", "PROTOC_VERSION=25.8",
       "-t", "${_TEST_IMAGE}",
       "-f", ".cloudbuild/library_generation/library_generation_airlock.Dockerfile",
       "."

.cloudbuild/library_generation/cloudbuild-library-generation-push.yaml

@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _GAPIC_GENERATOR_JAVA_VERSION: '2.64.2-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
+  _GAPIC_GENERATOR_JAVA_VERSION: '2.66.2-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
   _PRIVATE_IMAGE_NAME: "us-docker.pkg.dev/java-hermetic-build-prod/private-resources/java-library-generation"
   _PRIVATE_SHA_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:${COMMIT_SHA}"
   _PRIVATE_LATEST_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:latest"

.cloudbuild/library_generation/library_generation.Dockerfile

@@ -21,7 +21,7 @@ FROM docker.io/library/maven:3.9.9-eclipse-temurin-17-alpine@sha256:969014ee8852
 WORKDIR /sdk-platform-java
 COPY . .
 # {x-version-update-start:gapic-generator-java:current}
-ENV DOCKER_GAPIC_GENERATOR_VERSION="2.64.2-SNAPSHOT"
+ENV DOCKER_GAPIC_GENERATOR_VERSION="2.66.2-SNAPSHOT"
 # {x-version-update-end}
 
 # Download the java formatter
@@ -37,8 +37,8 @@ RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_
 FROM docker.io/library/python:3.13.2-slim@sha256:6b3223eb4d93718828223966ad316909c39813dee3ee9395204940500792b740 as final
 
 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
-ARG PROTOC_VERSION=25.8
-ARG GRPC_VERSION=1.76.1
+ARG PROTOC_VERSION=33.2
+ARG GRPC_VERSION=1.76.3
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"
 

.cloudbuild/library_generation/library_generation_airlock.Dockerfile

@@ -21,7 +21,7 @@ FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/maven@sha256:d3f0
 WORKDIR /sdk-platform-java
 COPY . .
 # {x-version-update-start:gapic-generator-java:current}
-ENV DOCKER_GAPIC_GENERATOR_VERSION="2.64.2-SNAPSHOT"
+ENV DOCKER_GAPIC_GENERATOR_VERSION="2.66.2-SNAPSHOT"
 # {x-version-update-end}
 
 # Download the java formatter
@@ -38,8 +38,8 @@ RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_
 FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/python@sha256:afc139a0a640942491ec481ad8dda10f2c5b753f5c969393b12480155fe15a63 as final
 
 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
-ARG PROTOC_VERSION=25.8
-ARG GRPC_VERSION=1.76.1
+ARG PROTOC_VERSION=33.2
+ARG GRPC_VERSION=1.76.3
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"
 

.cloudbuild/library_generation/scripts/integration_tests.py

@@ -43,7 +43,10 @@ def test_monorepo_generation(self):
             compare_result = dircmp(
                 f"{golden_dir}/{library_name}",
                 actual_library,
-                ignore=[".repo-metadata.json"],
+                # README.md is ignored because the golden files in the 
+                # google-cloud-java repository still contain the old build badges.
+                # TODO: Remove README.md from ignore list once golden files are updated.
+                ignore=[".repo-metadata.json", "README.md"],
             )
             diff_files = []
             golden_only = []