From 24abf1f02556174e4162a96fbdaa3a5baa0db0d8 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Wed, 27 Apr 2022 15:37:35 -0700 Subject: [PATCH 1/3] Upgrade gcsio to 2.2.6 --- .../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 5d5b1e9377fb..edf8104acfa1 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -457,7 +457,7 @@ class BeamModulePlugin implements Plugin { // Try to keep gax_version consistent with gax-grpc version in google_cloud_platform_libraries_bom def gax_version = "2.8.1" def google_clients_version = "1.32.1" - def google_cloud_bigdataoss_version = "2.2.4" + def google_cloud_bigdataoss_version = "2.2.6" // Try to keep google_cloud_spanner_version consistent with google_cloud_spanner_bom in google_cloud_platform_libraries_bom def google_cloud_spanner_version = "6.20.0" def google_code_gson_version = "2.8.9" @@ -609,6 +609,8 @@ class BeamModulePlugin implements Plugin { grpc_netty : "io.grpc:grpc-netty", // google_cloud_platform_libraries_bom sets version grpc_netty_shaded : "io.grpc:grpc-netty-shaded", // google_cloud_platform_libraries_bom sets version grpc_stub : "io.grpc:grpc-stub", // google_cloud_platform_libraries_bom sets version + // Once grpc-xds is added to google_cloud_platform_libraries_bom, use google_cloud_platform_libraries_bom instead. + grpc_xds : "io.grpc:grpc-xds:$grpc_version", guava : "com.google.guava:guava:$guava_version", guava_testlib : "com.google.guava:guava-testlib:$guava_version", hadoop_client : "org.apache.hadoop:hadoop-client:$hadoop_version", From f1f0bccf36e0af7750b7beaa0c7780bed7ec4b2d Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Wed, 27 Apr 2022 17:07:35 -0700 Subject: [PATCH 2/3] Added grpc_xds to deps --- sdks/java/io/google-cloud-platform/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index 8d1d0a1776d9..2786c3509b7e 100644 --- a/sdks/java/io/google-cloud-platform/build.gradle +++ b/sdks/java/io/google-cloud-platform/build.gradle @@ -105,6 +105,8 @@ dependencies { implementation library.java.grpc_protobuf implementation library.java.grpc_stub permitUnusedDeclared library.java.grpc_stub // BEAM-11761 + implementation library.java.grpc_xds + permitUnusedDeclared library.java.grpc_xds // BEAM-11761 implementation library.java.grpc_google_cloud_pubsub_v1 implementation library.java.grpc_google_cloud_pubsublite_v1 permitUnusedDeclared library.java.grpc_google_cloud_pubsublite_v1 // BEAM-11761 From 9721910ada785aa99e1259b0a620618be85703d5 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Fri, 29 Apr 2022 15:20:08 -0700 Subject: [PATCH 3/3] Added grpc-census dep --- .../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 ++ sdks/java/io/google-cloud-platform/build.gradle | 2 ++ 2 files changed, 4 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 edf8104acfa1..55797259c6fe 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -597,6 +597,8 @@ class BeamModulePlugin implements Plugin { grpc_alts : "io.grpc:grpc-alts", // google_cloud_platform_libraries_bom sets version grpc_api : "io.grpc:grpc-api", // google_cloud_platform_libraries_bom sets version grpc_auth : "io.grpc:grpc-auth", // google_cloud_platform_libraries_bom sets version + // Once grpc-xds is added to google_cloud_platform_libraries_bom, use google_cloud_platform_libraries_bom instead. + grpc_census : "io.grpc:grpc-census:$grpc_version", grpc_context : "io.grpc:grpc-context", // google_cloud_platform_libraries_bom sets version grpc_core : "io.grpc:grpc-core", // google_cloud_platform_libraries_bom sets version grpc_google_cloud_firestore_v1 : "com.google.api.grpc:grpc-google-cloud-firestore-v1", // google_cloud_platform_libraries_bom sets version diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index 2786c3509b7e..460d56e72a9a 100644 --- a/sdks/java/io/google-cloud-platform/build.gradle +++ b/sdks/java/io/google-cloud-platform/build.gradle @@ -95,6 +95,8 @@ dependencies { implementation library.java.grpc_auth implementation library.java.grpc_core permitUnusedDeclared library.java.grpc_core // BEAM-11761 + implementation library.java.grpc_census + permitUnusedDeclared library.java.grpc_census // BEAM-11761 implementation library.java.grpc_context permitUnusedDeclared library.java.grpc_context // BEAM-11761 implementation library.java.grpc_grpclb