From 43dc4b9028f9354878f40c2f4405def247bb279e Mon Sep 17 00:00:00 2001 From: Benjamin Gonzalez Date: Mon, 21 Feb 2022 13:46:17 -0600 Subject: [PATCH 1/6] Update bom version to 24.3.0 --- .../org/apache/beam/gradle/BeamModulePlugin.groovy | 12 ++++++------ .../container/license_scripts/dep_urls_java.yaml | 2 +- 2 files changed, 7 insertions(+), 7 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 6c6b140c6cf5..922320ea092a 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -463,7 +463,7 @@ class BeamModulePlugin implements Plugin { // a dependency version which should match across multiple // Maven artifacts. def activemq_version = "5.14.5" - def autovalue_version = "1.8.2" + def autovalue_version = "1.9" def autoservice_version = "1.0.1" def aws_java_sdk_version = "1.12.135" def aws_java_sdk2_version = "2.17.106" @@ -476,7 +476,7 @@ class BeamModulePlugin implements Plugin { def google_code_gson_version = "2.8.9" def google_oauth_clients_version = "1.32.1" // Try to keep grpc_version consistent with gRPC version in google_cloud_platform_libraries_bom - def grpc_version = "1.43.2" + def grpc_version = "1.44.0" def guava_version = "31.0.1-jre" def hadoop_version = "2.10.1" def hamcrest_version = "2.1" @@ -488,11 +488,11 @@ class BeamModulePlugin implements Plugin { 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.74.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.2" + def protobuf_version = "3.19.3" def quickcheck_version = "0.8" def slf4j_version = "1.7.30" def spark2_version = "2.4.8" @@ -587,9 +587,9 @@ class BeamModulePlugin implements Plugin { 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 // 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/24.2.0/artifact_details.html + // https://storage.googleapis.com/cloud-opensource-java-dashboard/com.google.cloud/libraries-bom/24.3.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:24.2.0", + google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:24.3.0", google_cloud_spanner : "com.google.cloud:google-cloud-spanner", // google_cloud_platform_libraries_bom sets version google_code_gson : "com.google.code.gson:gson:$google_code_gson_version", // google-http-client's version is explicitly declared for sdks/java/maven-archetypes/examples diff --git a/sdks/java/container/license_scripts/dep_urls_java.yaml b/sdks/java/container/license_scripts/dep_urls_java.yaml index 03a882303586..57745777c26f 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: - '24.2.0': + '24.3.0': license: "https://raw.githubusercontent.com/GoogleCloudPlatform/cloud-opensource-java/master/LICENSE" type: "Apache License 2.0" paranamer: From 94b5951a3eadc4b0e0b2b55a810d6c9b55599aa9 Mon Sep 17 00:00:00 2001 From: Benjamin Gonzalez Date: Mon, 21 Feb 2022 14:46:32 -0600 Subject: [PATCH 2/6] Update dependencies --- .../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 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 922320ea092a..22f540b45c9c 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -499,7 +499,7 @@ class BeamModulePlugin implements Plugin { def spark3_version = "3.1.2" def spotbugs_version = "4.0.6" def testcontainers_version = "1.16.3" - def arrow_version = "5.0.0" + def arrow_version = "7.0.0" def jmh_version = "1.34" // A map of maps containing common libraries used per language. To use: @@ -616,7 +616,7 @@ class BeamModulePlugin implements Plugin { grpc_protobuf : "io.grpc:grpc-protobuf", // google_cloud_platform_libraries_bom sets version grpc_protobuf_lite : "io.grpc:grpc-protobuf-lite:$grpc_version", 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_netty_shaded : "io.grpc:grpc-netty-shaded:1.44.1", // google_cloud_platform_libraries_bom sets version grpc_stub : "io.grpc:grpc-stub", // google_cloud_platform_libraries_bom sets version guava : "com.google.guava:guava:$guava_version", guava_testlib : "com.google.guava:guava-testlib:$guava_version", @@ -659,7 +659,7 @@ class BeamModulePlugin implements Plugin { 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.33.Final", + netty_tcnative_boringssl_static : "io.netty:netty-tcnative-boringssl-static:2.0.48.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", From 38f55fcb11dce68e975b005cc95d47355460bcf1 Mon Sep 17 00:00:00 2001 From: Benjamin Gonzalez Date: Mon, 21 Feb 2022 15:37:32 -0600 Subject: [PATCH 3/6] Update dependencies --- .../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 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 22f540b45c9c..46896f1c1b9e 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -488,7 +488,7 @@ class BeamModulePlugin implements Plugin { def jsr305_version = "3.0.2" def kafka_version = "2.4.1" def nemo_version = "0.1" - def netty_version = "4.1.74.Final" + def netty_version = "4.1.72.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 @@ -659,7 +659,7 @@ class BeamModulePlugin implements Plugin { 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.48.Final", + netty_tcnative_boringssl_static : "io.netty:netty-tcnative-boringssl-static:2.0.46.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", From 827d44d0a706468fe6949f0e2a2bbfd79b9fe1be Mon Sep 17 00:00:00 2001 From: Benjamin Gonzalez Date: Mon, 21 Feb 2022 17:33:26 -0600 Subject: [PATCH 4/6] Restore version update --- .../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 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 46896f1c1b9e..1c731ac69949 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -616,7 +616,7 @@ class BeamModulePlugin implements Plugin { grpc_protobuf : "io.grpc:grpc-protobuf", // google_cloud_platform_libraries_bom sets version grpc_protobuf_lite : "io.grpc:grpc-protobuf-lite:$grpc_version", grpc_netty : "io.grpc:grpc-netty", // google_cloud_platform_libraries_bom sets version - grpc_netty_shaded : "io.grpc:grpc-netty-shaded:1.44.1", // 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 guava : "com.google.guava:guava:$guava_version", guava_testlib : "com.google.guava:guava-testlib:$guava_version", From a24a25cbc051c4c1d43b099ad190a38c94e3acaa Mon Sep 17 00:00:00 2001 From: Benjamin Gonzalez Date: Tue, 22 Feb 2022 13:58:59 -0600 Subject: [PATCH 5/6] Rollback arrow_version update --- .../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 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 1c731ac69949..73a715f8c831 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -499,7 +499,7 @@ class BeamModulePlugin implements Plugin { def spark3_version = "3.1.2" def spotbugs_version = "4.0.6" def testcontainers_version = "1.16.3" - def arrow_version = "7.0.0" + def arrow_version = "5.0.0" def jmh_version = "1.34" // A map of maps containing common libraries used per language. To use: From fd16c0e2d18b333ced8463bf2f14dd8e35be736a Mon Sep 17 00:00:00 2001 From: Benjamin Gonzalez Date: Tue, 22 Feb 2022 15:29:01 -0600 Subject: [PATCH 6/6] Rollback netty_version --- .../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 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 73a715f8c831..797879844cc2 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -488,7 +488,7 @@ class BeamModulePlugin implements Plugin { def jsr305_version = "3.0.2" def kafka_version = "2.4.1" def nemo_version = "0.1" - def netty_version = "4.1.72.Final" + def netty_version = "4.1.52.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