Skip to content

[BEAM-8688] Upgrade GCSIO to 2.2.6 #17486

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
suztomo merged 3 commits into from
May 2, 2022
Merged

[BEAM-8688] Upgrade GCSIO to 2.2.6 #17486

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
24abf1f
Upgrade gcsio to 2.2.6
veblush Apr 27, 2022
f1f0bcc
Added grpc_xds to deps
veblush Apr 28, 2022
9721910
Added grpc-census dep
veblush Apr 29, 2022
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
6 changes: 5 additions & 1 deletion 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 @@ -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.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"
Expand Down Expand Up @@ -597,6 +597,8 @@ 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
Expand All @@ -609,6 +611,8 @@ 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",
Copy link
Contributor

@suztomo suztomo Apr 27, 2022

Choose a reason for hiding this comment

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

Declaring this key in the map doesn't have any effect.

Copy link
Contributor Author

@veblush veblush Apr 28, 2022

Choose a reason for hiding this comment

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

Oh I added it to sdks/java/io/google-cloud-platform/build.gradle. PTAL

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",
Expand Down
4 changes: 4 additions & 0 deletions sdks/java/io/google-cloud-platform/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -105,6 +107,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
Expand Down