This is an automated email from the ASF dual-hosted git repository.
shunping pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new 62f901f6bfd Upgrade google-api-client to 2.7.2 and use bomupgrade to
manage (#40670)
62f901f6bfd is described below
commit 62f901f6bfd0ebf79430ef001cea8b9a6ba5cbf0
Author: Shunping Huang <[email protected]>
AuthorDate: Tue Oct 20 09:36:41 2026 -0400
Upgrade google-api-client to 2.7.2 and use bomupgrade to manage (#40670)
---
.../org/apache/beam/gradle/BeamModulePlugin.groovy | 20 +++++++++++++-------
.../google-cloud-dataflow-java/worker/build.gradle | 2 +-
scripts/tools/bomupgrader.py | 1 +
3 files changed, 15 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 17fc16e9967..c0681f63d02 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -623,7 +623,11 @@ class BeamModulePlugin implements Plugin<Project> {
// [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"
+ // [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.
+ 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"
@@ -750,15 +754,17 @@ class BeamModulePlugin implements Plugin<Project> {
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",
+ // 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",
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 a343cac2817..232fb683866 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=<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'
diff --git a/scripts/tools/bomupgrader.py b/scripts/tools/bomupgrader.py
index 715c19a899d..b0ad507dc4d 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",
