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 f59f2c9d851e..ba4e2fb236dd 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -526,16 +526,16 @@ class BeamModulePlugin implements Plugin { def dbcp2_version = "2.9.0" 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.29.0" + def gax_version = "2.31.0" 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.43.0" + def google_cloud_spanner_version = "6.43.2" 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.55.1" - def guava_version = "32.0.1-jre" + def grpc_version = "1.55.3" + def guava_version = "32.1.2-jre" def hadoop_version = "2.10.2" def hamcrest_version = "2.1" def influxdb_version = "2.19" @@ -640,10 +640,10 @@ class BeamModulePlugin implements Plugin { dbcp2 : "org.apache.commons:commons-dbcp2:$dbcp2_version", error_prone_annotations : "com.google.errorprone:error_prone_annotations:$errorprone_version", flogger_system_backend : "com.google.flogger:flogger-system-backend:0.7.3", - gax : "com.google.api:gax", // google_cloud_platform_libraries_bom sets version - gax_grpc : "com.google.api:gax-grpc", // google_cloud_platform_libraries_bom sets version + gax : "com.google.api:gax:$gax_version", // google_cloud_platform_libraries_bom sets version + gax_grpc : "com.google.api:gax-grpc:$gax_version", // google_cloud_platform_libraries_bom sets version gax_grpc_test : "com.google.api:gax-grpc:$gax_version:testlib", // google_cloud_platform_libraries_bom sets version - gax_httpjson : "com.google.api:gax-httpjson", // google_cloud_platform_libraries_bom sets version + gax_httpjson : "com.google.api:gax-httpjson:$gax_version", // google_cloud_platform_libraries_bom sets version google_api_client : "com.google.api-client:google-api-client:$google_clients_version", // for the libraries using $google_clients_version below. 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", @@ -658,8 +658,8 @@ class BeamModulePlugin implements Plugin { 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 google_cloud_bigquery_storage : "com.google.cloud:google-cloud-bigquerystorage", // google_cloud_platform_libraries_bom sets version - google_cloud_bigtable : "com.google.cloud:google-cloud-bigtable", // google_cloud_platform_libraries_bom sets version - google_cloud_bigtable_client_core_config : "com.google.cloud.bigtable:bigtable-client-core-config:1.28.0", + google_cloud_bigtable : "com.google.cloud:google-cloud-bigtable:2.25.2", // google_cloud_platform_libraries_bom sets version + google_cloud_bigtable_client_core_config : "com.google.cloud.bigtable:bigtable-client-core-config:1.29.2", google_cloud_bigtable_emulator : "com.google.cloud:google-cloud-bigtable-emulator:0.147.3", google_cloud_core : "com.google.cloud:google-cloud-core", // google_cloud_platform_libraries_bom sets version google_cloud_core_grpc : "com.google.cloud:google-cloud-core-grpc", // google_cloud_platform_libraries_bom sets version @@ -771,8 +771,8 @@ class BeamModulePlugin implements Plugin { protobuf_java : "com.google.protobuf:protobuf-java:$protobuf_version", protobuf_java_util : "com.google.protobuf:protobuf-java-util:$protobuf_version", proto_google_cloud_bigquery_storage_v1 : "com.google.api.grpc:proto-google-cloud-bigquerystorage-v1", // google_cloud_platform_libraries_bom sets version - 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_bigtable_admin_v2 : "com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:2.25.0", // google_cloud_platform_libraries_bom sets version + proto_google_cloud_bigtable_v2 : "com.google.api.grpc:proto-google-cloud-bigtable-v2:2.25.0", // 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", // 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 diff --git a/sdks/java/container/license_scripts/dep_urls_java.yaml b/sdks/java/container/license_scripts/dep_urls_java.yaml index 944b6c1a1b0c..f97d4729681a 100644 --- a/sdks/java/container/license_scripts/dep_urls_java.yaml +++ b/sdks/java/container/license_scripts/dep_urls_java.yaml @@ -34,6 +34,10 @@ antlr-runtime: '3.1.2': license: "https://raw.githubusercontent.com/antlr/antlr4/master/LICENSE.txt" type: "3-Clause BSD" +guava-parent: + '32.1.2-jre': + license: "https://github.com/google/guava/blob/master/LICENSE" + type: "Apache License 2.0" jcip-annotations: '1.0': license: "https://raw.githubusercontent.com/stephenc/jcip-annotations/master/LICENSE.txt" diff --git a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/data/BeamFnDataGrpcClientTest.java b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/data/BeamFnDataGrpcClientTest.java index af3d1f15cdaf..678ec57a159d 100644 --- a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/data/BeamFnDataGrpcClientTest.java +++ b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/data/BeamFnDataGrpcClientTest.java @@ -203,6 +203,7 @@ public StreamObserver data( valueInGlobalWindow("ABC"), valueInGlobalWindow("DEF"), valueInGlobalWindow("GHI"))); } finally { server.shutdownNow(); + server.awaitTermination(); } } @@ -278,6 +279,7 @@ public StreamObserver data( assertEquals(1, consumerInvoked.get()); } finally { server.shutdownNow(); + server.awaitTermination(); } } @@ -334,6 +336,7 @@ public StreamObserver data( assertThat(inboundServerValues, contains(ELEMENTS_A_1, ELEMENTS_A_2)); } finally { server.shutdownNow(); + server.awaitTermination(); } } }