Skip to content

Upgrade google-api-client to 2.7.2 and use bomupgrade to manage #40670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shunping merged 3 commits into from
Oct 20, 2026
Merged

Upgrade google-api-client to 2.7.2 and use bomupgrade to manage #40670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12bb0e4
Upgrade google-api-client to 2.7.2
shunping Oct 19, 2026
c55b9c3
Add a comment for manual upgrade google-api-services-* artifacts
shunping Oct 19, 2026
8f7204c
Let bomupgrader manage the google-api-client version
shunping Oct 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,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"

@Abacn Abacn Oct 19, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's add a [bomupgrader] comment to opt in to bomupgrader

@shunping shunping Oct 19, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, we can do that after the tests are green.

@shunping shunping Oct 19, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in the latest commit.

// 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"
Expand Down Expand Up @@ -749,15 +753,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
Expand Down
2 changes: 1 addition & 1 deletion runners/google-cloud-dataflow-java/worker/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 1 addition & 0 deletions scripts/tools/bomupgrader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading