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 f15294a [BEAM-8691] Upgrading bigtable-client-core to 1.19.1
f15294a is described below
commit f15294a120884a07f5ebcc3cdac468f3a50997da
Author: Tomo Suzuki <suzt...@google.com>
AuthorDate: Thu Apr 22 15:49:54 2021 -0400
[BEAM-8691] Upgrading bigtable-client-core to 1.19.1
GcpApiSurfaceTest failed after upgrading bigtable-client-core to 1.19.1
because its CallOptionsConfig uses Guava's Optional as one of the
return values of APIs.
(Guava's Optional has its Supplier in one of API argument.)
https://github.com/googleapis/java-bigtable-hbase/pull/2717
Note that, while these classes have counterparts in Java 8,
bigtable-client-core targets Java 7 as minimum required Java version.
This commit adds the two classes into the allow-list in GcpApiSurfaceTest.
---
buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +-
.../src/test/java/org/apache/beam/sdk/io/gcp/GcpApiSurfaceTest.java | 2 ++
2 files changed, 3 insertions(+), 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 13d1ce5..465061d 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -523,7 +523,7 @@ 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:1.18.1",
- google_cloud_bigtable_client_core :
"com.google.cloud.bigtable:bigtable-client-core:1.16.0",
+ google_cloud_bigtable_client_core :
"com.google.cloud.bigtable:bigtable-client-core:1.19.1",
google_cloud_bigtable_emulator :
"com.google.cloud:google-cloud-bigtable-emulator:0.125.2",
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
diff --git
a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/GcpApiSurfaceTest.java
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/GcpApiSurfaceTest.java
index 685bee3..91c4421 100644
---
a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/GcpApiSurfaceTest.java
+++
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/GcpApiSurfaceTest.java
@@ -73,6 +73,8 @@ public class GcpApiSurfaceTest {
Matchers.equalTo(com.google.api.gax.rpc.ApiException.class),
Matchers.<Class<?>>equalTo(com.google.api.gax.rpc.StatusCode.class),
Matchers.<Class<?>>equalTo(com.google.common.base.Function.class),
+ Matchers.<Class<?>>equalTo(com.google.common.base.Optional.class),
+ Matchers.<Class<?>>equalTo(com.google.common.base.Supplier.class),
Matchers.<Class<?>>equalTo(com.google.api.gax.rpc.StatusCode.Code.class),
Matchers.<Class<?>>equalTo(com.google.cloud.bigtable.grpc.BigtableClusterName.class),
Matchers.<Class<?>>equalTo(com.google.cloud.bigtable.grpc.BigtableInstanceName.class),
