This is an automated email from the ASF dual-hosted git repository.
lcwik 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 64c73a7 [BEAM-4262] Bumping bigtable versions (#6078)
64c73a7 is described below
commit 64c73a7b8eebee71730209418875be6f2208f570
Author: Garrett Jones <[email protected]>
AuthorDate: Thu Jul 26 11:12:57 2018 -0700
[BEAM-4262] Bumping bigtable versions (#6078)
---
.../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 15 +++++++--------
1 file changed, 7 insertions(+), 8 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 cae9fb7..b2fa9c1 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -295,9 +295,10 @@ class BeamModulePlugin implements Plugin<Project> {
// These versions are defined here because they represent
// a dependency version which should match across multiple
// Maven artifacts.
+ def generated_grpc_beta_version = "0.19.0"
+ def generated_grpc_ga_version = "1.18.0"
def google_cloud_bigdataoss_version = "1.4.5"
- def bigtable_version = "1.0.0"
- def bigtable_proto_version = "1.0.0-pre3"
+ def bigtable_version = "1.4.0"
def google_clients_version = "1.23.0"
def google_auth_version = "0.10.0"
def grpc_version = "1.13.1"
@@ -309,8 +310,6 @@ class BeamModulePlugin implements Plugin<Project> {
def hadoop_version = "2.7.3"
def jackson_version = "2.9.5"
def spark_version = "2.3.1"
- def spanner_grpc_version = "0.19.0"
- def pubsub_grpc_version = "1.18.0"
def apex_core_version = "3.7.0"
def apex_malhar_version = "3.4.0"
def postgres_version = "42.2.2"
@@ -339,7 +338,7 @@ class BeamModulePlugin implements Plugin<Project> {
bigdataoss_gcsio :
"com.google.cloud.bigdataoss:gcsio:$google_cloud_bigdataoss_version",
bigdataoss_util :
"com.google.cloud.bigdataoss:util:$google_cloud_bigdataoss_version",
bigtable_client_core :
"com.google.cloud.bigtable:bigtable-client-core:$bigtable_version",
- bigtable_protos :
"com.google.cloud.bigtable:bigtable-protos:$bigtable_proto_version",
+ bigtable_protos :
"com.google.api.grpc:grpc-google-cloud-bigtable-v2:$generated_grpc_beta_version",
byte_buddy :
"net.bytebuddy:byte-buddy:1.8.11",
commons_compress :
"org.apache.commons:commons-compress:1.16.1",
commons_csv :
"org.apache.commons:commons-csv:1.4",
@@ -376,7 +375,7 @@ class BeamModulePlugin implements Plugin<Project> {
grpc_all :
"io.grpc:grpc-all:$grpc_version",
grpc_auth :
"io.grpc:grpc-auth:$grpc_version",
grpc_core :
"io.grpc:grpc-core:$grpc_version",
- grpc_google_cloud_pubsub_v1 :
"com.google.api.grpc:grpc-google-cloud-pubsub-v1:$pubsub_grpc_version",
+ grpc_google_cloud_pubsub_v1 :
"com.google.api.grpc:grpc-google-cloud-pubsub-v1:$generated_grpc_ga_version",
grpc_protobuf :
"io.grpc:grpc-protobuf:$grpc_version",
grpc_protobuf_lite :
"io.grpc:grpc-protobuf-lite:$grpc_version",
grpc_netty :
"io.grpc:grpc-netty:$grpc_version",
@@ -411,8 +410,8 @@ class BeamModulePlugin implements Plugin<Project> {
postgres :
"org.postgresql:postgresql:$postgres_version",
protobuf_java :
"com.google.protobuf:protobuf-java:$protobuf_version",
protobuf_java_util :
"com.google.protobuf:protobuf-java-util:$protobuf_version",
- proto_google_cloud_pubsub_v1 :
"com.google.api.grpc:proto-google-cloud-pubsub-v1:$pubsub_grpc_version",
- proto_google_cloud_spanner_admin_database_v1:
"com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:$spanner_grpc_version",
+ proto_google_cloud_pubsub_v1 :
"com.google.api.grpc:proto-google-cloud-pubsub-v1:$generated_grpc_ga_version",
+ proto_google_cloud_spanner_admin_database_v1:
"com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:$generated_grpc_beta_version",
proto_google_common_protos :
"com.google.api.grpc:proto-google-common-protos:$proto_google_common_protos",
slf4j_api :
"org.slf4j:slf4j-api:1.7.25",
slf4j_simple :
"org.slf4j:slf4j-simple:1.7.25",
