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/09/07 23:38:30 UTC
[beam] branch master updated: Merge pull request #22996: [BEAM-11205] Update GCP Libraries BOM dependencies to version 26.1.1
This is an automated email from the ASF dual-hosted git repository.
suztomo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new 4ec319d2799 Merge pull request #22996: [BEAM-11205] Update GCP Libraries BOM dependencies to version 26.1.1
4ec319d2799 is described below
commit 4ec319d27999aa7d5b7d9dfa1b9aed4e130e0bf2
Author: Rajat Bhatta <93...@users.noreply.github.com>
AuthorDate: Thu Sep 8 05:08:23 2022 +0530
Merge pull request #22996: [BEAM-11205] Update GCP Libraries BOM dependencies to version 26.1.1
* [BEAM-11205] Update Libraries BOM dependencies to version 26.1.1 in BeamModulePlugin.groovy
* Update dep_urls_java.yaml
* Upgrade Netty version to match GCP libraries
This resolves the following linkage errors:
Class io.netty.util.internal.ClassInitializerUtil is not found;
referenced by 1 class file
io.netty.channel.unix.Unix (io.netty:netty-transport-native-unix-common:4.1.77.Final)
Cause:
Dependency conflict: io.netty:netty-common:4.1.52.Final does not define Class io.netty.util.internal.ClassInitializerUtil but io.netty:netty-common:4.1.77.Final defines it.
selected: org.apache.beam:beam-sdks-java-io-google-cloud-platform:jar:2.42.0-SNAPSHOT / io.netty:netty-handler:4.1.52.Final (compile) / io.netty:netty-common:4.1.52.Final (compile)
unselected: org.apache.beam:beam-sdks-java-io-google-cloud-platform:jar:2.42.0-SNAPSHOT / io.grpc:grpc-netty:1.48.0 (compile) / io.netty:netty-transport-native-unix-common:4.1.77.Final (runtime) / io.netty:netty-common:4.1.77.Final (compile)
(io.netty:netty-transport:4.1.52.Final) Class io.netty.channel.socket.DatagramPacket has changed incompatibly;
referenced by 1 class file
io.netty.channel.unix.SegmentedDatagramPacket (io.netty:netty-transport-native-unix-common:4.1.77.Final)
Cause:
Dependency conflict: io.netty:netty-transport:4.1.52.Final does not define Class io.netty.channel.socket.DatagramPacket but io.netty:netty-transport:4.1.77.Final defines it.
selected: org.apache.beam:beam-sdks-java-io-google-cloud-platform:jar:2.42.0-SNAPSHOT / io.netty:netty-handler:4.1.52.Final (compile) / io.netty:netty-transport:4.1.52.Final (compile)
unselected: org.apache.beam:beam-sdks-java-io-google-cloud-platform:jar:2.42.0-SNAPSHOT / io.grpc:grpc-netty:1.48.0 (compile) / io.netty:netty-transport-native-unix-common:4.1.77.Final (runtime) / io.netty:netty-transport:4.1.77.Final (compile)
* Declare newer google-oauth-client
This avoids linkage errors:
(com.google.oauth-client:google-oauth-client:1.32.1) com.google.api.client.auth.openidconnect.IdTokenVerifier's method verifyPayload(com.google.api.client.auth.openidconnect.IdToken) is not found;
referenced by 1 class file
com.google.api.client.googleapis.auth.oauth2.GoogleIdTokenVerifier (com.google.api-client:google-api-client:2.0.0)
Cause:
Dependency conflict: com.google.oauth-client:google-oauth-client:1.32.1 does not define com.google.api.client.auth.openidconnect.IdTokenVerifier's method verifyPayload(com.google.api.client.auth.openidconnect.IdToken) but com.google.oauth-client:google-oauth-client:1.34.1 defines it.
selected: org.apache.beam:beam-sdks-java-io-google-cloud-platform:jar:2.42.0-SNAPSHOT / com.google.cloud.bigdataoss:util:2.2.6 (compile) / com.google.oauth-client:google-oauth-client:1.32.1 (compile)
unselected: org.apache.beam:beam-sdks-java-io-google-cloud-platform:jar:2.42.0-SNAPSHOT / com.google.api-client:google-api-client:2.0.0 (compile) / com.google.oauth-client:google-oauth-client:1.34.1 (compile)
* netty-tcnative version to align Netty version
Co-authored-by: Tomo Suzuki <su...@google.com>
---
.../org/apache/beam/gradle/BeamModulePlugin.groovy | 36 +++++++++++-----------
.../container/license_scripts/dep_urls_java.yaml | 2 +-
sdks/java/io/google-cloud-platform/build.gradle | 4 +++
3 files changed, 23 insertions(+), 19 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 f0e1a3b344e..2796c090e77 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -464,15 +464,15 @@ class BeamModulePlugin implements Plugin<Project> {
def classgraph_version = "4.8.104"
def errorprone_version = "2.10.0"
// Try to keep gax_version consistent with gax-grpc version in google_cloud_platform_libraries_bom
- def gax_version = "2.16.0"
- def google_clients_version = "1.32.1"
+ def gax_version = "2.18.7"
+ def google_clients_version = "2.0.0"
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.23.3"
- def google_code_gson_version = "2.9.0"
- def google_oauth_clients_version = "1.33.3"
+ def google_cloud_spanner_version = "6.29.0"
+ def google_code_gson_version = "2.9.1"
+ def google_oauth_clients_version = "1.34.1"
// Try to keep grpc_version consistent with gRPC version in google_cloud_platform_libraries_bom
- def grpc_version = "1.45.1"
+ def grpc_version = "1.48.0"
def guava_version = "31.1-jre"
def hadoop_version = "2.10.2"
def hamcrest_version = "2.1"
@@ -484,11 +484,11 @@ class BeamModulePlugin implements Plugin<Project> {
def jsr305_version = "3.0.2"
def kafka_version = "2.4.1"
def nemo_version = "0.1"
- def netty_version = "4.1.52.Final"
+ def netty_version = "4.1.77.Final"
def postgres_version = "42.2.16"
def powermock_version = "2.0.9"
// Try to keep protobuf_version consistent with the protobuf version in google_cloud_platform_libraries_bom
- def protobuf_version = "3.19.4"
+ def protobuf_version = "3.21.4"
def quickcheck_version = "1.0"
def sbe_tool_version = "1.25.1"
def slf4j_version = "1.7.30"
@@ -575,13 +575,13 @@ class BeamModulePlugin implements Plugin<Project> {
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-rev20211129-$google_clients_version",
- google_api_services_clouddebugger : "com.google.apis:google-api-services-clouddebugger:v2-rev20210813-$google_clients_version",
- google_api_services_cloudresourcemanager : "com.google.apis:google-api-services-cloudresourcemanager:v1-rev20211017-$google_clients_version",
- google_api_services_dataflow : "com.google.apis:google-api-services-dataflow:v1b3-rev20210818-$google_clients_version",
- google_api_services_healthcare : "com.google.apis:google-api-services-healthcare:v1-rev20211016-$google_clients_version",
- google_api_services_pubsub : "com.google.apis:google-api-services-pubsub:v1-rev20211130-$google_clients_version",
- google_api_services_storage : "com.google.apis:google-api-services-storage:v1-rev20211201-$google_clients_version",
+ google_api_services_bigquery : "com.google.apis:google-api-services-bigquery:v2-rev20220827-$google_clients_version",
+ google_api_services_clouddebugger : "com.google.apis:google-api-services-clouddebugger:v2-rev20220318-$google_clients_version",
+ google_api_services_cloudresourcemanager : "com.google.apis:google-api-services-cloudresourcemanager:v1-rev20220828-$google_clients_version",
+ google_api_services_dataflow : "com.google.apis:google-api-services-dataflow:v1b3-rev20220812-$google_clients_version",
+ google_api_services_healthcare : "com.google.apis:google-api-services-healthcare:v1-rev20220818-$google_clients_version",
+ google_api_services_pubsub : "com.google.apis:google-api-services-pubsub:v1-rev20220829-$google_clients_version",
+ google_api_services_storage : "com.google.apis:google-api-services-storage:v1-rev20220705-$google_clients_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
@@ -600,7 +600,7 @@ class BeamModulePlugin implements Plugin<Project> {
// The GCP Libraries BOM dashboard shows the versions set by the BOM:
// https://storage.googleapis.com/cloud-opensource-java-dashboard/com.google.cloud/libraries-bom/25.2.0/artifact_details.html
// Update libraries-bom version on sdks/java/container/license_scripts/dep_urls_java.yaml
- google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:25.2.0",
+ google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:26.1.1",
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_code_gson : "com.google.code.gson:gson:$google_code_gson_version",
@@ -677,7 +677,7 @@ class BeamModulePlugin implements Plugin<Project> {
nemo_compiler_frontend_beam : "org.apache.nemo:nemo-compiler-frontend-beam:$nemo_version",
netty_all : "io.netty:netty-all:$netty_version",
netty_handler : "io.netty:netty-handler:$netty_version",
- netty_tcnative_boringssl_static : "io.netty:netty-tcnative-boringssl-static:2.0.47.Final",
+ netty_tcnative_boringssl_static : "io.netty:netty-tcnative-boringssl-static:2.0.52.Final",
netty_transport_native_epoll : "io.netty:netty-transport-native-epoll:$netty_version",
postgres : "org.postgresql:postgresql:$postgres_version",
powermock : "org.powermock:powermock-module-junit4:$powermock_version",
@@ -688,7 +688,7 @@ class BeamModulePlugin implements Plugin<Project> {
proto_google_cloud_bigtable_admin_v2 : "com.google.api.grpc:proto-google-cloud-bigtable-admin-v2", // google_cloud_platform_libraries_bom sets version
proto_google_cloud_bigtable_v2 : "com.google.api.grpc:proto-google-cloud-bigtable-v2", // google_cloud_platform_libraries_bom sets version
proto_google_cloud_datacatalog_v1beta1 : "com.google.api.grpc:proto-google-cloud-datacatalog-v1beta1", // google_cloud_platform_libraries_bom sets version
- proto_google_cloud_datastore_v1 : "com.google.api.grpc:proto-google-cloud-datastore-v1:0.100.0", // google_cloud_platform_libraries_bom sets version
+ proto_google_cloud_datastore_v1 : "com.google.api.grpc:proto-google-cloud-datastore-v1", // google_cloud_platform_libraries_bom sets version
proto_google_cloud_firestore_v1 : "com.google.api.grpc:proto-google-cloud-firestore-v1", // google_cloud_platform_libraries_bom sets version
proto_google_cloud_pubsub_v1 : "com.google.api.grpc:proto-google-cloud-pubsub-v1", // google_cloud_platform_libraries_bom sets version
proto_google_cloud_pubsublite_v1 : "com.google.api.grpc:proto-google-cloud-pubsublite-v1", // google_cloud_platform_libraries_bom sets version
diff --git a/sdks/java/container/license_scripts/dep_urls_java.yaml b/sdks/java/container/license_scripts/dep_urls_java.yaml
index 86dcb83430c..0765594e154 100644
--- a/sdks/java/container/license_scripts/dep_urls_java.yaml
+++ b/sdks/java/container/license_scripts/dep_urls_java.yaml
@@ -42,7 +42,7 @@ jaxen:
'1.1.6':
type: "3-Clause BSD"
libraries-bom:
- '25.2.0':
+ '26.1.1':
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/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle
index ef404d77c17..b2532643d40 100644
--- a/sdks/java/io/google-cloud-platform/build.gradle
+++ b/sdks/java/io/google-cloud-platform/build.gradle
@@ -89,6 +89,10 @@ dependencies {
implementation library.java.google_code_gson
implementation library.java.google_http_client
implementation library.java.google_http_client_jackson2
+ // bigdataoss_util declares old google_oauth_client version that does not have
+ // IdTokenVerifier.verifyPayload method. Let's declare the newer one.
+ implementation library.java.google_oauth_client
+ permitUnusedDeclared library.java.google_oauth_client
implementation library.java.grpc_alts
permitUnusedDeclared library.java.grpc_alts // BEAM-11761
implementation library.java.grpc_api