From 812e98fac243bab2a88f6ea5fad6147ff8e54a97 Mon Sep 17 00:00:00 2001 From: Yi Hu Date: Tue, 9 Apr 2024 00:26:44 -0400 Subject: [PATCH] Bump GCP-BOM to 26.36.0 (#30868) * Bump GCP-BOM to 26.36.0 * Fix test * Fix test * Fix analyzeClassesDependencies --- .../beam/gradle/BeamModulePlugin.groovy | 20 +++++++++---------- scripts/tools/bomupgrader.py | 2 +- .../license_scripts/dep_urls_java.yaml | 2 +- .../gcp/bigtable/BigtableServiceImplTest.java | 2 +- 4 files changed, 13 insertions(+), 13 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 d4a163256413..1a0164a0e53a 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -601,16 +601,16 @@ class BeamModulePlugin implements Plugin { def dbcp2_version = "2.9.0" def errorprone_version = "2.10.0" // [bomupgrader] determined by: com.google.api:gax, consistent with: google_cloud_platform_libraries_bom - def gax_version = "2.42.0" + def gax_version = "2.46.1" def google_ads_version = "26.0.0" def google_clients_version = "2.0.0" def google_cloud_bigdataoss_version = "2.2.16" // [bomupgrader] determined by: com.google.cloud:google-cloud-spanner, consistent with: google_cloud_platform_libraries_bom - def google_cloud_spanner_version = "6.58.0" + def google_cloud_spanner_version = "6.62.0" def google_code_gson_version = "2.10.1" def google_oauth_clients_version = "1.34.1" // [bomupgrader] determined by: io.grpc:grpc-netty, consistent with: google_cloud_platform_libraries_bom - def grpc_version = "1.61.0" + def grpc_version = "1.62.2" def guava_version = "32.1.2-jre" def hadoop_version = "2.10.2" def hamcrest_version = "2.1" @@ -640,7 +640,7 @@ class BeamModulePlugin implements Plugin { def spotbugs_version = "4.0.6" def testcontainers_version = "1.17.3" // [bomupgrader] determined by: org.apache.arrow:arrow-memory-core, consistent with: google_cloud_platform_libraries_bom - def arrow_version = "15.0.0" + def arrow_version = "15.0.1" def jmh_version = "1.34" def jupiter_version = "5.7.0" @@ -730,12 +730,12 @@ class BeamModulePlugin implements Plugin { google_api_client_jackson2 : "com.google.api-client:google-api-client-jackson2:$google_clients_version", google_api_client_java6 : "com.google.api-client:google-api-client-java6:$google_clients_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-rev20240124-2.0.0", // [bomupgrader] sets version - google_api_services_cloudresourcemanager : "com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240128-2.0.0", // [bomupgrader] sets version + google_api_services_bigquery : "com.google.apis:google-api-services-bigquery:v2-rev20240229-2.0.0", // [bomupgrader] sets version + google_api_services_cloudresourcemanager : "com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240310-2.0.0", // [bomupgrader] sets version google_api_services_dataflow : "com.google.apis:google-api-services-dataflow:v1b3-rev20240218-$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_storage : "com.google.apis:google-api-services-storage:v1-rev20240205-2.0.0", // [bomupgrader] sets version + google_api_services_storage : "com.google.apis:google-api-services-storage:v1-rev20240311-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 google_cloud_bigquery : "com.google.cloud:google-cloud-bigquery", // google_cloud_platform_libraries_bom sets version @@ -747,13 +747,13 @@ class BeamModulePlugin implements Plugin { google_cloud_core_grpc : "com.google.cloud:google-cloud-core-grpc", // google_cloud_platform_libraries_bom sets version google_cloud_datacatalog_v1beta1 : "com.google.cloud:google-cloud-datacatalog", // google_cloud_platform_libraries_bom sets version google_cloud_dataflow_java_proto_library_all: "com.google.cloud.dataflow:google-cloud-dataflow-java-proto-library-all:0.5.160304", - google_cloud_datastore_v1_proto_client : "com.google.cloud.datastore:datastore-v1-proto-client:2.18.3", // [bomupgrader] sets version + google_cloud_datastore_v1_proto_client : "com.google.cloud.datastore:datastore-v1-proto-client:2.19.0", // [bomupgrader] sets version google_cloud_firestore : "com.google.cloud:google-cloud-firestore", // google_cloud_platform_libraries_bom sets version google_cloud_pubsub : "com.google.cloud:google-cloud-pubsub", // google_cloud_platform_libraries_bom sets version google_cloud_pubsublite : "com.google.cloud:google-cloud-pubsublite", // google_cloud_platform_libraries_bom sets version // [bomupgrader] the BOM version is set by scripts/tools/bomupgrader.py. If update manually, also update // libraries-bom version on sdks/java/container/license_scripts/dep_urls_java.yaml - google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:26.32.0", + google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:26.36.0", google_cloud_spanner : "com.google.cloud:google-cloud-spanner", // google_cloud_platform_libraries_bom sets version google_cloud_spanner_test : "com.google.cloud:google-cloud-spanner:$google_cloud_spanner_version:tests", google_cloud_vertexai : "com.google.cloud:google-cloud-vertexai", // google_cloud_platform_libraries_bom sets version @@ -1329,7 +1329,7 @@ class BeamModulePlugin implements Plugin { "com.google.auto.service:auto-service-annotations:$autoservice_version", "com.google.auto.value:auto-value-annotations:$autovalue_version", "com.google.code.findbugs:jsr305:$jsr305_version", - "com.google.j2objc:j2objc-annotations:2.8", + "com.google.j2objc:j2objc-annotations:3.0.0", // These dependencies are needed to avoid error-prone warnings on package-info.java files, // also to include the annotations to suppress warnings. // diff --git a/scripts/tools/bomupgrader.py b/scripts/tools/bomupgrader.py index afec1ee1ff42..8d27e0a34046 100644 --- a/scripts/tools/bomupgrader.py +++ b/scripts/tools/bomupgrader.py @@ -58,7 +58,7 @@ class BeamModulePluginProcessor: # So we need to add it to the example project to get the version to sync OTHER_CONSTRANTS = [ "com.google.cloud:google-cloud-bigquery", # for arrow - 'com.google.cloud:google-cloud-nio', # for google-api-services-storage + 'com.google.cloud:google-cloud-storage', # for google-api-services-storage 'com.google.cloud:google-cloud-resourcemanager', # for google-api-services-cloudresourcemanager 'com.google.cloud:google-cloud-datastore', # for google-cloud-dataflow-java-proto-library-all ] diff --git a/sdks/java/container/license_scripts/dep_urls_java.yaml b/sdks/java/container/license_scripts/dep_urls_java.yaml index 03aff94adae4..b17487ce1053 100644 --- a/sdks/java/container/license_scripts/dep_urls_java.yaml +++ b/sdks/java/container/license_scripts/dep_urls_java.yaml @@ -46,7 +46,7 @@ jaxen: '1.1.6': type: "3-Clause BSD" libraries-bom: - '26.32.0': + '26.36.0': license: "https://raw.githubusercontent.com/GoogleCloudPlatform/cloud-opensource-java/master/LICENSE" type: "Apache License 2.0" paranamer: diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableServiceImplTest.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableServiceImplTest.java index 9a07f625ca1c..8291c21e7e84 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableServiceImplTest.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableServiceImplTest.java @@ -811,7 +811,7 @@ public void run() { */ @Test public void testWrite() throws IOException { - doReturn(mockBatcher).when(mockBigtableDataClient).newBulkMutationBatcher(any()); + doReturn(mockBatcher).when(mockBigtableDataClient).newBulkMutationBatcher((String) any()); SettableApiFuture fakeFuture = SettableApiFuture.create(); when(mockBatcher.closeAsync()).thenReturn(fakeFuture); ArgumentCaptor captor = ArgumentCaptor.forClass(RowMutationEntry.class);