You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by jk...@apache.org on 2017/09/20 00:40:55 UTC
[1/2] beam git commit: Updates grpc-google-pubsub-v1 to
grpc-google-cloud-pubsub-v1
Repository: beam
Updated Branches:
refs/heads/master cfbdb6115 -> e8a52827e
Updates grpc-google-pubsub-v1 to grpc-google-cloud-pubsub-v1
This is good because it's a newer version, and because it gets
rid of a dependency conflict with Spanner.
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/c6bedf11
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/c6bedf11
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/c6bedf11
Branch: refs/heads/master
Commit: c6bedf11f5a44c944ee4d2a94ddb6c1c81f8c822
Parents: cfbdb61
Author: Mairbek Khadikov <ma...@google.com>
Authored: Mon Sep 18 15:03:51 2017 -0700
Committer: Eugene Kirpichov <ki...@google.com>
Committed: Tue Sep 19 17:00:26 2017 -0700
----------------------------------------------------------------------
pom.xml | 10 ++++++++--
sdks/java/io/google-cloud-platform/pom.xml | 7 ++++++-
2 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/c6bedf11/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a2d6aae..236645c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@
<bigquery.version>v2-rev355-1.22.0</bigquery.version>
<bigtable.version>1.0.0-pre3</bigtable.version>
<cloudresourcemanager.version>v1-rev6-1.22.0</cloudresourcemanager.version>
- <pubsubgrpc.version>0.1.0</pubsubgrpc.version>
+ <pubsubgrpc.version>0.1.18</pubsubgrpc.version>
<clouddebugger.version>v2-rev8-1.22.0</clouddebugger.version>
<dataflow.version>v1b3-rev198-1.22.0</dataflow.version>
<dataflow.proto.version>0.5.160222</dataflow.proto.version>
@@ -888,7 +888,7 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
- <artifactId>grpc-google-pubsub-v1</artifactId>
+ <artifactId>grpc-google-cloud-pubsub-v1</artifactId>
<version>${pubsubgrpc.version}</version>
<exclusions>
<!-- Exclude an old version of guava that is being pulled in by a transitive
@@ -908,6 +908,12 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-cloud-pubsub-v1</artifactId>
+ <version>${pubsubgrpc.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-spanner-admin-database-v1</artifactId>
<version>${grpc-google-common-protos.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/beam/blob/c6bedf11/sdks/java/io/google-cloud-platform/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/io/google-cloud-platform/pom.xml b/sdks/java/io/google-cloud-platform/pom.xml
index 7842bcd..1bce683 100644
--- a/sdks/java/io/google-cloud-platform/pom.xml
+++ b/sdks/java/io/google-cloud-platform/pom.xml
@@ -187,7 +187,12 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
- <artifactId>grpc-google-pubsub-v1</artifactId>
+ <artifactId>grpc-google-cloud-pubsub-v1</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-cloud-pubsub-v1</artifactId>
</dependency>
<dependency>
[2/2] beam git commit: This closes #3862: [BEAM-2837] Updated
grpc-google-pubsub-v1 dependency
Posted by jk...@apache.org.
This closes #3862: [BEAM-2837] Updated grpc-google-pubsub-v1 dependency
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/e8a52827
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/e8a52827
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/e8a52827
Branch: refs/heads/master
Commit: e8a52827e792c9cbce5832e5edcd0399428c24f3
Parents: cfbdb61 c6bedf1
Author: Eugene Kirpichov <ki...@google.com>
Authored: Tue Sep 19 17:01:33 2017 -0700
Committer: Eugene Kirpichov <ki...@google.com>
Committed: Tue Sep 19 17:01:33 2017 -0700
----------------------------------------------------------------------
pom.xml | 10 ++++++++--
sdks/java/io/google-cloud-platform/pom.xml | 7 ++++++-
2 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------