Skip to content
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.

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

(No need to review) Testing google_cloud_bigtable 2.25.2 with Beam 2.49.0 #28597

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
4bfd752
gax 2.31.0, cloud spanner 6.43.2, grpc 1.55.3, guava 32.1.1-jre
burkedavison Jul 26, 2023
788a401
bigtable 2.25.0
burkedavison Jul 27, 2023
fcb12b6
:sdks:java:extensions:sql:jdbc guava declaration
burkedavison Jul 27, 2023
300e57e
:sdks:java:extensions:google-cloud-platform-core guava declaration
burkedavison Jul 27, 2023
5799193
:sdks:java:extensions:ml guava declaration
burkedavison Jul 27, 2023
1329d1f
:sdks:java:extensions:sql:datacatalog guava declaration
burkedavison Jul 27, 2023
93c676c
:sdks:java:extensions:sql:perf-tests guava declaration
burkedavison Jul 27, 2023
816cfe2
:sdks:java:extensions:sql guava declaration
burkedavison Jul 27, 2023
21aee09
:sdks:java:extensions:zetasketch guava declaration
burkedavison Jul 27, 2023
d1ac0e9
:sdks:java:testing:load-tests guava declaration
burkedavison Jul 27, 2023
f5f4372
:sdks:java:testing:nexmark guava declaration
burkedavison Jul 27, 2023
afad9fe
:sdks:java:testing:tpcds guava declaration
burkedavison Jul 27, 2023
53f08c2
:sdks:java:testing:watermarks guava declaration
burkedavison Jul 27, 2023
031b839
:runners:google-cloud-dataflow-java guava declaration
burkedavison Jul 27, 2023
89cf730
:runners:google-cloud-dataflow-java:examples guava declaration
burkedavison Jul 27, 2023
918accd
:runners:google-cloud-dataflow-java:examples-streaming guava declaration
burkedavison Jul 27, 2023
be34717
:runners:flink guava declaration
burkedavison Jul 27, 2023
8cbeda7
:sdks:java:testing:test-utils guava declaration
burkedavison Jul 27, 2023
e3a8201
:sdks:java:io:google-cloud-platform guava declaration and listenablef…
burkedavison Jul 27, 2023
e07d597
:sdks:java:extensions:sql:zetasql guava declaration for permitUnusedD…
burkedavison Jul 27, 2023
8dc6d4f
:examples:java guava declaration
burkedavison Jul 27, 2023
3c49f73
:sdks:java:extensions:sql:datacatalog guava declaration for permitUnu…
burkedavison Jul 27, 2023
125cb05
:runners:google-cloud-dataflow-java guava declaration for permitUnuse…
burkedavison Jul 27, 2023
ad686c3
:beam-test-infra-pipelines guava declaration
burkedavison Jul 27, 2023
90d2e5f
Use explicitly defined gax, gax-grpc, and gax-httpjson versions
burkedavison Jul 28, 2023
eac5d72
Add guava license to dep_urls_java.yaml
burkedavison Jul 28, 2023
12b1daf
:sdks:java:io:google-cloud-platform:expansion-service guava declaration
burkedavison Jul 28, 2023
5b5224a
BeamFnDataGrpcClientTest: awaitTermination before proceeding to next …
burkedavison Jul 28, 2023
dcdb05e
Trivial change. Force Java PreCommit rerun
burkedavison Jul 28, 2023
b1d35c6
Revert bigtable emulator to 0.147.3
burkedavison Jul 29, 2023
03897c0
Fix unusedDeclaredArtifacts for guava with permitUnusedDeclared
burkedavison Jul 31, 2023
ff07dfe
guava 32.1.2-jre
burkedavison Aug 1, 2023
22eb439
revert gradle config changes for guava 32.1.1
burkedavison Aug 1, 2023
c5a72d7
revert remaining config changes for guava
burkedavison Aug 1, 2023
9d4a219
remaining reverts x2
burkedavison Aug 1, 2023
752854b
Update to google_cloud_bigtable to 2.25.2
burkedavison Sep 21, 2023
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
Original file line number Diff line number Diff line change
Expand Up @@ -526,16 +526,16 @@ class BeamModulePlugin implements Plugin<Project> {
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"
Expand Down Expand Up @@ -640,10 +640,10 @@ class BeamModulePlugin implements Plugin<Project> {
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",
Expand All @@ -658,8 +658,8 @@ class BeamModulePlugin implements Plugin<Project> {
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
Expand Down Expand Up @@ -771,8 +771,8 @@ class BeamModulePlugin implements Plugin<Project> {
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
Expand Down
4 changes: 4 additions & 0 deletions sdks/java/container/license_scripts/dep_urls_java.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ public StreamObserver<BeamFnApi.Elements> data(
valueInGlobalWindow("ABC"), valueInGlobalWindow("DEF"), valueInGlobalWindow("GHI")));
} finally {
server.shutdownNow();
server.awaitTermination();
}
}

Expand Down Expand Up @@ -278,6 +279,7 @@ public StreamObserver<BeamFnApi.Elements> data(
assertEquals(1, consumerInvoked.get());
} finally {
server.shutdownNow();
server.awaitTermination();
}
}

Expand Down Expand Up @@ -334,6 +336,7 @@ public StreamObserver<BeamFnApi.Elements> data(
assertThat(inboundServerValues, contains(ELEMENTS_A_1, ELEMENTS_A_2));
} finally {
server.shutdownNow();
server.awaitTermination();
}
}
}
Loading