From 1f2fe8bf98c78c640e999a04cc0425b77bc27dc1 Mon Sep 17 00:00:00 2001 From: blakeli Date: Tue, 31 Mar 2026 14:47:02 -0400 Subject: [PATCH 1/8] deps:Upgrade grpc to 1.80.0 --- .../library_generation/library_generation.Dockerfile | 2 +- .../library_generation/library_generation_airlock.Dockerfile | 2 +- sdk-platform-java/gapic-generator-java-pom-parent/pom.xml | 2 +- sdk-platform-java/gax-java/dependencies.properties | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk-platform-java/.cloudbuild/library_generation/library_generation.Dockerfile b/sdk-platform-java/.cloudbuild/library_generation/library_generation.Dockerfile index 1da14a498210..8178e63379ed 100644 --- a/sdk-platform-java/.cloudbuild/library_generation/library_generation.Dockerfile +++ b/sdk-platform-java/.cloudbuild/library_generation/library_generation.Dockerfile @@ -38,7 +38,7 @@ FROM docker.io/library/python:3.13.2-slim@sha256:6b3223eb4d93718828223966ad31690 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5 ARG PROTOC_VERSION=33.2 -ARG GRPC_VERSION=1.76.3 +ARG GRPC_VERSION=1.80.0 ENV HOME=/home ENV OS_ARCHITECTURE="linux-x86_64" diff --git a/sdk-platform-java/.cloudbuild/library_generation/library_generation_airlock.Dockerfile b/sdk-platform-java/.cloudbuild/library_generation/library_generation_airlock.Dockerfile index 26e28091e57c..cfe3b7b45c50 100644 --- a/sdk-platform-java/.cloudbuild/library_generation/library_generation_airlock.Dockerfile +++ b/sdk-platform-java/.cloudbuild/library_generation/library_generation_airlock.Dockerfile @@ -39,7 +39,7 @@ FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/python@sha256:afc ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5 ARG PROTOC_VERSION=33.2 -ARG GRPC_VERSION=1.76.3 +ARG GRPC_VERSION=1.80.0 ENV HOME=/home ENV OS_ARCHITECTURE="linux-x86_64" diff --git a/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml b/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml index 57b697858660..452ede8a0fd0 100644 --- a/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml +++ b/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml @@ -26,7 +26,7 @@ 1.3.2 - 1.76.3 + 1.80.0 1.43.0 2.1.0 2.12.1 diff --git a/sdk-platform-java/gax-java/dependencies.properties b/sdk-platform-java/gax-java/dependencies.properties index 94482c46e7b0..85508c8d5365 100644 --- a/sdk-platform-java/gax-java/dependencies.properties +++ b/sdk-platform-java/gax-java/dependencies.properties @@ -28,7 +28,7 @@ version.gax_httpjson=2.76.1-SNAPSHOT version.com_google_protobuf=3.25.8 version.google_java_format=1.15.0 -version.io_grpc=1.76.2 +version.io_grpc=1.80.0 # Maven artifacts. # Note, the actual name of each property matters (bazel build scripts depend on it). From c7cc28b7cad451640326bc5c5dee92c5920c9784 Mon Sep 17 00:00:00 2001 From: blakeli Date: Tue, 31 Mar 2026 15:13:05 -0400 Subject: [PATCH 2/8] deps:Upgrade error prone to 2.45.0 due to grpc --- sdk-platform-java/gapic-generator-java-pom-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml b/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml index 452ede8a0fd0..ada07cbb63bb 100644 --- a/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml +++ b/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml @@ -33,7 +33,7 @@ 33.5.0-jre 4.33.2 1.51.0 - 2.42.0 + 2.45.0 3.1 1.7.0 5.11.4 From f131959bc436aae1200c9cc9d12a88d73c2c4f78 Mon Sep 17 00:00:00 2001 From: blakeli Date: Tue, 31 Mar 2026 15:34:00 -0400 Subject: [PATCH 3/8] deps: upgrade animal-sniffer-annotations to 1.26 --- sdk-platform-java/gax-java/dependencies.properties | 2 +- .../java-shared-dependencies/third-party-dependencies/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk-platform-java/gax-java/dependencies.properties b/sdk-platform-java/gax-java/dependencies.properties index 85508c8d5365..7e97dc28e7b6 100644 --- a/sdk-platform-java/gax-java/dependencies.properties +++ b/sdk-platform-java/gax-java/dependencies.properties @@ -74,7 +74,7 @@ maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.58.2 maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.47.1 maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.47.1 -maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.24 +maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.26 maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2 maven.org_graalvm_sdk=org.graalvm.sdk:nativeimage:24.1.2 maven.org_slf4j_slf4j_api=org.slf4j:slf4j-api:2.0.16 diff --git a/sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml b/sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml index 5a9e18683490..62565e6def86 100644 --- a/sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml +++ b/sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml @@ -24,7 +24,7 @@ ${project.artifactId} 1.8.0 - 1.24 + 1.26 0.31.1 3.0.2 2.18.2 From 728c5481ffdaa06f3dd430f29e4248acf4a92eb7 Mon Sep 17 00:00:00 2001 From: blakeli Date: Tue, 31 Mar 2026 20:01:48 -0400 Subject: [PATCH 4/8] ci: correct working-directory for sdk-platform-java verify library generation --- ...sdk-platform-java-verify_library_generation.yaml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sdk-platform-java-verify_library_generation.yaml b/.github/workflows/sdk-platform-java-verify_library_generation.yaml index 752d78d52cad..46b0b6092b1e 100644 --- a/.github/workflows/sdk-platform-java-verify_library_generation.yaml +++ b/.github/workflows/sdk-platform-java-verify_library_generation.yaml @@ -43,7 +43,7 @@ jobs: git checkout -b "${head_ref}" fork/${head_ref} changed_directories="$(git diff --name-only "fork/${head_ref}" "origin/${base_ref}")" fi - if [[ ${changed_directories} =~ "hermetic_build/" ]] || [[ ${changed_directories} =~ ".cloudbuild/library_generation/" ]]; then + if [[ ${changed_directories} =~ "sdk-platform-java/hermetic_build/" ]] || [[ ${changed_directories} =~ "sdk-platform-java/.cloudbuild/library_generation/" ]]; then echo "should_run=true" >> $GITHUB_OUTPUT else echo "should_run=false" >> $GITHUB_OUTPUT @@ -58,6 +58,9 @@ jobs: needs: [filter, should-run-library-generation-tests] if: needs.filter.outputs.library == 'true' && needs.should-run-library-generation-tests.outputs.should_run == 'true' runs-on: ubuntu-22.04 + defaults: + run: + working-directory: sdk-platform-java steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 @@ -86,12 +89,15 @@ jobs: needs: [filter, should-run-library-generation-tests] if: needs.filter.outputs.library == 'true' && needs.should-run-library-generation-tests.outputs.should_run == 'true' runs-on: ubuntu-22.04 + defaults: + run: + working-directory: sdk-platform-java steps: - uses: actions/checkout@v4 - name: Run ShellCheck uses: ludeeus/action-shellcheck@2.0.0 with: - scandir: 'hermetic_build' + scandir: 'sdk-platform-java/hermetic_build' format: tty severity: error ignore_paths: @@ -100,6 +106,9 @@ jobs: needs: [filter, should-run-library-generation-tests] if: needs.filter.outputs.library == 'true' && needs.should-run-library-generation-tests.outputs.should_run == 'true' runs-on: ubuntu-22.04 + defaults: + run: + working-directory: sdk-platform-java steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 From 24d0afb0581dfc3dd8442f34b4774804fb3107d1 Mon Sep 17 00:00:00 2001 From: blakeli Date: Wed, 1 Apr 2026 15:15:59 -0400 Subject: [PATCH 5/8] build: Patch protobuf bazel build rule to export ProtoInfo for grpc 1.80.0 --- sdk-platform-java/gax-java/repositories.bzl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sdk-platform-java/gax-java/repositories.bzl b/sdk-platform-java/gax-java/repositories.bzl index 4231c5790aa4..e939306c2543 100644 --- a/sdk-platform-java/gax-java/repositories.bzl +++ b/sdk-platform-java/gax-java/repositories.bzl @@ -53,6 +53,12 @@ def com_google_api_gax_java_repositories(): name = "com_google_protobuf", urls = ["https://github.com/protocolbuffers/protobuf/archive/%s.zip" % _protobuf_version_in_link], strip_prefix = "protobuf-%s" % _protobuf_version, + patch_cmds = [ + "mkdir -p bazel/common", + "touch bazel/common/BUILD", + "echo 'load(\"@@rules_proto//proto:defs.bzl\", _ProtoInfo = \"ProtoInfo\")' > bazel/common/proto_info.bzl", + "echo 'ProtoInfo = _ProtoInfo' >> bazel/common/proto_info.bzl", + ], ) _grpc_version = PROPERTIES["version.io_grpc"] From 6168767e492b1dd81ba8f4103f30b33dca537019 Mon Sep 17 00:00:00 2001 From: blakeli Date: Wed, 1 Apr 2026 15:38:52 -0400 Subject: [PATCH 6/8] build: Patch protobuf bazel build rule to export java_proto_library for grpc 1.80.0 --- sdk-platform-java/gax-java/repositories.bzl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sdk-platform-java/gax-java/repositories.bzl b/sdk-platform-java/gax-java/repositories.bzl index e939306c2543..1e12b586cb64 100644 --- a/sdk-platform-java/gax-java/repositories.bzl +++ b/sdk-platform-java/gax-java/repositories.bzl @@ -56,8 +56,10 @@ def com_google_api_gax_java_repositories(): patch_cmds = [ "mkdir -p bazel/common", "touch bazel/common/BUILD", - "echo 'load(\"@@rules_proto//proto:defs.bzl\", _ProtoInfo = \"ProtoInfo\")' > bazel/common/proto_info.bzl", - "echo 'ProtoInfo = _ProtoInfo' >> bazel/common/proto_info.bzl", + "touch bazel/BUILD", + "cat <<'EOF' > bazel/common/proto_info.bzl\nload(\"@rules_proto//proto:defs.bzl\", _ProtoInfo = \"ProtoInfo\")\nProtoInfo = _ProtoInfo\nEOF", + "cat <<'EOF' > bazel/proto_library.bzl\ndef proto_library(**kwargs):\n native.proto_library(**kwargs)\nEOF", + "cat <<'EOF' > bazel/java_proto_library.bzl\ndef java_proto_library(**kwargs):\n native.java_proto_library(**kwargs)\nEOF", ], ) From 6ab022afce488fe78a19f15cef97f242b0fd760c Mon Sep 17 00:00:00 2001 From: blakeli Date: Wed, 1 Apr 2026 16:53:19 -0400 Subject: [PATCH 7/8] build: Upgrade protobuf to 4.33.2 and add missing transitives for grpc 1.80.0 --- WORKSPACE | 20 +++++++++++++++++++ .../gax-java/dependencies.properties | 4 ++-- sdk-platform-java/gax-java/repositories.bzl | 13 +++--------- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 6389b2d4612e..20613d42cee7 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -2,6 +2,26 @@ workspace(name = "gapic_generator_java") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") +http_archive( + name = "rules_java", + sha256 = "47632cc506c858011853073449801d648e10483d4b50e080ec2549a4b2398960", + urls = [ + "https://github.com/bazelbuild/rules_java/releases/download/8.15.2/rules_java-8.15.2.tar.gz", + ], +) + +load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies") +rules_java_dependencies() + +http_archive( + name = "rules_python", + sha256 = "c68bdc4fbec25de5b5493b8819cfc877c4ea299c0dcb15c244c5a00208cde311", + strip_prefix = "rules_python-0.31.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/0.31.0/rules_python-0.31.0.tar.gz", +) + +load("@rules_python//python:repositories.bzl", "py_repositories") +py_repositories() # gax-java and its transitive dependencies must be imported before # gapic-generator-java dependencies to match the order in googleapis repository, # which in its turn, prioritizes actual generated clients runtime dependencies diff --git a/sdk-platform-java/gax-java/dependencies.properties b/sdk-platform-java/gax-java/dependencies.properties index 7e97dc28e7b6..6f5f7940bcc3 100644 --- a/sdk-platform-java/gax-java/dependencies.properties +++ b/sdk-platform-java/gax-java/dependencies.properties @@ -26,7 +26,7 @@ version.gax_httpjson=2.76.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.8 +version.com_google_protobuf=4.33.2 version.google_java_format=1.15.0 version.io_grpc=1.80.0 @@ -78,7 +78,7 @@ maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-snif maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2 maven.org_graalvm_sdk=org.graalvm.sdk:nativeimage:24.1.2 maven.org_slf4j_slf4j_api=org.slf4j:slf4j-api:2.0.16 -maven.com_google_protobuf_protobuf_java_util=com.google.protobuf:protobuf-java-util:3.25.5 +maven.com_google_protobuf_protobuf_java_util=com.google.protobuf:protobuf-java-util:4.33.2 # Testing maven artifacts maven.junit_junit=junit:junit:4.13.2 diff --git a/sdk-platform-java/gax-java/repositories.bzl b/sdk-platform-java/gax-java/repositories.bzl index 1e12b586cb64..119b28727755 100644 --- a/sdk-platform-java/gax-java/repositories.bzl +++ b/sdk-platform-java/gax-java/repositories.bzl @@ -47,20 +47,13 @@ def com_google_api_gax_java_repositories(): # properties file. _protobuf_version = PROPERTIES["version.com_google_protobuf"] - _protobuf_version_in_link = "v%s" % _protobuf_version + _protobuf_source_tag = _protobuf_version[2:] if _protobuf_version.startswith("4.") else _protobuf_version + _protobuf_version_in_link = "v%s" % _protobuf_source_tag _maybe( http_archive, name = "com_google_protobuf", urls = ["https://github.com/protocolbuffers/protobuf/archive/%s.zip" % _protobuf_version_in_link], - strip_prefix = "protobuf-%s" % _protobuf_version, - patch_cmds = [ - "mkdir -p bazel/common", - "touch bazel/common/BUILD", - "touch bazel/BUILD", - "cat <<'EOF' > bazel/common/proto_info.bzl\nload(\"@rules_proto//proto:defs.bzl\", _ProtoInfo = \"ProtoInfo\")\nProtoInfo = _ProtoInfo\nEOF", - "cat <<'EOF' > bazel/proto_library.bzl\ndef proto_library(**kwargs):\n native.proto_library(**kwargs)\nEOF", - "cat <<'EOF' > bazel/java_proto_library.bzl\ndef java_proto_library(**kwargs):\n native.java_proto_library(**kwargs)\nEOF", - ], + strip_prefix = "protobuf-%s" % _protobuf_source_tag, ) _grpc_version = PROPERTIES["version.io_grpc"] From dbe275ea35b83b008a39e11b4362fb2471f150ee Mon Sep 17 00:00:00 2001 From: blakeli Date: Wed, 1 Apr 2026 17:12:40 -0400 Subject: [PATCH 8/8] build: Revert grpc back to 1.76.2 and drop protobuf 4.33 Bazel migrations --- WORKSPACE | 20 ------------------- .../gax-java/dependencies.properties | 8 ++++---- sdk-platform-java/gax-java/repositories.bzl | 5 ++--- 3 files changed, 6 insertions(+), 27 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 20613d42cee7..6389b2d4612e 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -2,26 +2,6 @@ workspace(name = "gapic_generator_java") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -http_archive( - name = "rules_java", - sha256 = "47632cc506c858011853073449801d648e10483d4b50e080ec2549a4b2398960", - urls = [ - "https://github.com/bazelbuild/rules_java/releases/download/8.15.2/rules_java-8.15.2.tar.gz", - ], -) - -load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies") -rules_java_dependencies() - -http_archive( - name = "rules_python", - sha256 = "c68bdc4fbec25de5b5493b8819cfc877c4ea299c0dcb15c244c5a00208cde311", - strip_prefix = "rules_python-0.31.0", - url = "https://github.com/bazelbuild/rules_python/releases/download/0.31.0/rules_python-0.31.0.tar.gz", -) - -load("@rules_python//python:repositories.bzl", "py_repositories") -py_repositories() # gax-java and its transitive dependencies must be imported before # gapic-generator-java dependencies to match the order in googleapis repository, # which in its turn, prioritizes actual generated clients runtime dependencies diff --git a/sdk-platform-java/gax-java/dependencies.properties b/sdk-platform-java/gax-java/dependencies.properties index 6f5f7940bcc3..94482c46e7b0 100644 --- a/sdk-platform-java/gax-java/dependencies.properties +++ b/sdk-platform-java/gax-java/dependencies.properties @@ -26,9 +26,9 @@ version.gax_httpjson=2.76.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=4.33.2 +version.com_google_protobuf=3.25.8 version.google_java_format=1.15.0 -version.io_grpc=1.80.0 +version.io_grpc=1.76.2 # Maven artifacts. # Note, the actual name of each property matters (bazel build scripts depend on it). @@ -74,11 +74,11 @@ maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.58.2 maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.47.1 maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.47.1 -maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.26 +maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.24 maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2 maven.org_graalvm_sdk=org.graalvm.sdk:nativeimage:24.1.2 maven.org_slf4j_slf4j_api=org.slf4j:slf4j-api:2.0.16 -maven.com_google_protobuf_protobuf_java_util=com.google.protobuf:protobuf-java-util:4.33.2 +maven.com_google_protobuf_protobuf_java_util=com.google.protobuf:protobuf-java-util:3.25.5 # Testing maven artifacts maven.junit_junit=junit:junit:4.13.2 diff --git a/sdk-platform-java/gax-java/repositories.bzl b/sdk-platform-java/gax-java/repositories.bzl index 119b28727755..4231c5790aa4 100644 --- a/sdk-platform-java/gax-java/repositories.bzl +++ b/sdk-platform-java/gax-java/repositories.bzl @@ -47,13 +47,12 @@ def com_google_api_gax_java_repositories(): # properties file. _protobuf_version = PROPERTIES["version.com_google_protobuf"] - _protobuf_source_tag = _protobuf_version[2:] if _protobuf_version.startswith("4.") else _protobuf_version - _protobuf_version_in_link = "v%s" % _protobuf_source_tag + _protobuf_version_in_link = "v%s" % _protobuf_version _maybe( http_archive, name = "com_google_protobuf", urls = ["https://github.com/protocolbuffers/protobuf/archive/%s.zip" % _protobuf_version_in_link], - strip_prefix = "protobuf-%s" % _protobuf_source_tag, + strip_prefix = "protobuf-%s" % _protobuf_version, ) _grpc_version = PROPERTIES["version.io_grpc"]