You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by su...@apache.org on 2022/05/02 17:16:46 UTC
[beam] branch revert-17486-gcsio-226 created (now 1937eb1bb1b)
This is an automated email from the ASF dual-hosted git repository.
suztomo pushed a change to branch revert-17486-gcsio-226
in repository https://gitbox.apache.org/repos/asf/beam.git
at 1937eb1bb1b Revert "[BEAM-8688] Upgrade GCSIO to 2.2.6 (#17486)"
This branch includes the following new commits:
new 1937eb1bb1b Revert "[BEAM-8688] Upgrade GCSIO to 2.2.6 (#17486)"
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[beam] 01/01: Revert "[BEAM-8688] Upgrade GCSIO to 2.2.6 (#17486)"
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
suztomo pushed a commit to branch revert-17486-gcsio-226
in repository https://gitbox.apache.org/repos/asf/beam.git
commit 1937eb1bb1bccd7075c86c29ba36307c32899e8b
Author: Tomo Suzuki <su...@gmail.com>
AuthorDate: Mon May 2 13:16:34 2022 -0400
Revert "[BEAM-8688] Upgrade GCSIO to 2.2.6 (#17486)"
This reverts commit 12dbe920aad9dc476aaefd16463edac03580c440.
---
.../src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 6 +-----
sdks/java/io/google-cloud-platform/build.gradle | 4 ----
2 files changed, 1 insertion(+), 9 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 75a8a504a2a..a48e2b72658 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<Project> {
// 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.6"
+ def google_cloud_bigdataoss_version = "2.2.4"
// 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"
@@ -597,8 +597,6 @@ class BeamModulePlugin implements Plugin<Project> {
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
@@ -611,8 +609,6 @@ class BeamModulePlugin implements Plugin<Project> {
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",
diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle
index 8da891d3aba..392fe06a931 100644
--- a/sdks/java/io/google-cloud-platform/build.gradle
+++ b/sdks/java/io/google-cloud-platform/build.gradle
@@ -95,8 +95,6 @@ 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
@@ -107,8 +105,6 @@ 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