From 12bb0e4ab6657452e7e73194526cfecdd763f9bc Mon Sep 17 00:00:00 2001 From: Shunping Huang Date: Mon, 19 Oct 2026 17:53:38 -0400 Subject: [PATCH 1/3] Upgrade google-api-client to 2.7.2 google_clients_version (2.0.0) was used both as the google-api-client version and as the google-api-services-* artifact suffix. Because Beam forces library versions, google-api-client was pinned to 2.0.0, while current generated clients and libraries-bom require 2.7.2. Split it into google_api_client_version (2.7.2) and google_api_services_version_suffix (2.0.0). --- .../apache/beam/gradle/BeamModulePlugin.groovy | 17 ++++++++++------- .../worker/build.gradle | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 19ecad1a5afc..2f7fce91fb49 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -622,7 +622,10 @@ class BeamModulePlugin implements Plugin { // [bomupgrader] determined by: com.google.api:gax, consistent with: google_cloud_platform_libraries_bom def gax_version = "2.84.0" def google_ads_version = "33.0.0" - def google_clients_version = "2.0.0" + def google_api_client_version = "2.7.2" + // Suffix of the generated com.google.apis:google-api-services-* artifact versions + // (e.g. v1b3-rev20260503-2.0.0). This is NOT the google-api-client version. + def google_api_services_version_suffix = "2.0.0" def google_cloud_bigdataoss_version = "3.1.16" def google_code_gson_version = "2.10.1" def google_oauth_clients_version = "1.34.1" @@ -749,15 +752,15 @@ class BeamModulePlugin implements Plugin { gax_grpc : "com.google.api:gax-grpc", // google_cloud_platform_libraries_bom sets version gax_grpc_test : "com.google.api:gax-grpc:$gax_version:testlib", // google_cloud_platform_libraries_bom sets version gax_httpjson : "com.google.api:gax-httpjson", // google_cloud_platform_libraries_bom sets version - google_api_client : "com.google.api-client:google-api-client:$google_clients_version", // for the libraries using $google_clients_version below. - google_api_client_gson : "com.google.api-client:google-api-client-gson:$google_clients_version", - google_api_client_java6 : "com.google.api-client:google-api-client-java6:$google_clients_version", + google_api_client : "com.google.api-client:google-api-client:$google_api_client_version", + google_api_client_gson : "com.google.api-client:google-api-client-gson:$google_api_client_version", + google_api_client_java6 : "com.google.api-client:google-api-client-java6:$google_api_client_version", google_api_common : "com.google.api:api-common", // google_cloud_platform_libraries_bom sets version google_api_services_bigquery : "com.google.apis:google-api-services-bigquery:v2-rev20260731-2.0.0", // [bomupgrader] sets version google_api_services_cloudresourcemanager : "com.google.apis:google-api-services-cloudresourcemanager:v1-rev20250606-2.0.0", // [bomupgrader] sets version - google_api_services_dataflow : "com.google.apis:google-api-services-dataflow:v1b3-rev20260503-$google_clients_version", - google_api_services_healthcare : "com.google.apis:google-api-services-healthcare:v1-rev20240130-$google_clients_version", - google_api_services_pubsub : "com.google.apis:google-api-services-pubsub:v1-rev20220904-$google_clients_version", + google_api_services_dataflow : "com.google.apis:google-api-services-dataflow:v1b3-rev20260503-$google_api_services_version_suffix", + google_api_services_healthcare : "com.google.apis:google-api-services-healthcare:v1-rev20240130-$google_api_services_version_suffix", + google_api_services_pubsub : "com.google.apis:google-api-services-pubsub:v1-rev20220904-$google_api_services_version_suffix", google_api_services_storage : "com.google.apis:google-api-services-storage:v1-rev20260524-2.0.0", // [bomupgrader] sets version google_auth_library_credentials : "com.google.auth:google-auth-library-credentials", // google_cloud_platform_libraries_bom sets version google_auth_library_oauth2_http : "com.google.auth:google-auth-library-oauth2-http", // google_cloud_platform_libraries_bom sets version diff --git a/runners/google-cloud-dataflow-java/worker/build.gradle b/runners/google-cloud-dataflow-java/worker/build.gradle index a343cac28177..232fb683866b 100644 --- a/runners/google-cloud-dataflow-java/worker/build.gradle +++ b/runners/google-cloud-dataflow-java/worker/build.gradle @@ -20,7 +20,7 @@ plugins { id 'org.apache.beam.module' } // Set a specific version of 'com.google.apis:google-api-services-dataflow' // by adding -Pdataflow.version= in Gradle command. Otherwise, -// 'google_clients_version' defined in BeamModulePlugin will be used as default. +// 'library.java.google_api_services_dataflow' defined in BeamModulePlugin will be used as default. def DATAFLOW_VERSION = "dataflow.version" // Get full dependency of 'com.google.apis:google-api-services-dataflow' From c55b9c33baecf9bddb8235847b548340a47f9c7c Mon Sep 17 00:00:00 2001 From: Shunping Huang Date: Mon, 19 Oct 2026 18:04:29 -0400 Subject: [PATCH 2/3] Add a comment for manual upgrade google-api-services-* artifacts --- .../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 2f7fce91fb49..77edd01d7032 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -758,6 +758,8 @@ class BeamModulePlugin implements Plugin { google_api_common : "com.google.api:api-common", // google_cloud_platform_libraries_bom sets version google_api_services_bigquery : "com.google.apis:google-api-services-bigquery:v2-rev20260731-2.0.0", // [bomupgrader] sets version google_api_services_cloudresourcemanager : "com.google.apis:google-api-services-cloudresourcemanager:v1-rev20250606-2.0.0", // [bomupgrader] sets version + // libraries-bom does not pin the following THREE google-api-services-* artifacts (no library + // in the BOM depends on them), so bomupgrader cannot upgrade them. Upgrade them manually. google_api_services_dataflow : "com.google.apis:google-api-services-dataflow:v1b3-rev20260503-$google_api_services_version_suffix", google_api_services_healthcare : "com.google.apis:google-api-services-healthcare:v1-rev20240130-$google_api_services_version_suffix", google_api_services_pubsub : "com.google.apis:google-api-services-pubsub:v1-rev20220904-$google_api_services_version_suffix", From 8f7204c9ecd22a71100e5e609e22e5c775d85eb1 Mon Sep 17 00:00:00 2001 From: Shunping Huang Date: Mon, 19 Oct 2026 19:51:07 -0400 Subject: [PATCH 3/3] Let bomupgrader manage the google-api-client version --- .../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 1 + scripts/tools/bomupgrader.py | 1 + 2 files changed, 2 insertions(+) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 77edd01d7032..e23976c64a62 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -622,6 +622,7 @@ class BeamModulePlugin implements Plugin { // [bomupgrader] determined by: com.google.api:gax, consistent with: google_cloud_platform_libraries_bom def gax_version = "2.84.0" def google_ads_version = "33.0.0" + // [bomupgrader] determined by: com.google.api-client:google-api-client, consistent with: google_cloud_platform_libraries_bom def google_api_client_version = "2.7.2" // Suffix of the generated com.google.apis:google-api-services-* artifact versions // (e.g. v1b3-rev20260503-2.0.0). This is NOT the google-api-client version. diff --git a/scripts/tools/bomupgrader.py b/scripts/tools/bomupgrader.py index 715c19a899d1..b0ad507dc4db 100644 --- a/scripts/tools/bomupgrader.py +++ b/scripts/tools/bomupgrader.py @@ -103,6 +103,7 @@ class BeamModulePluginProcessor: KNOWN_DEPS = { "arrow": "org.apache.arrow:arrow-memory-core", "gax": "com.google.api:gax", + "google_api_client": "com.google.api-client:google-api-client", "grpc": "io.grpc:grpc-netty", # use "grpc-netty" to pick up proper netty version "netty": "io.netty:netty-transport",