You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2016/09/22 21:43:11 UTC
[2/3] incubator-beam git commit: Update grpc to 1.0.1 and protobuf to
3.0.0
Update grpc to 1.0.1 and protobuf to 3.0.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/f93ca9ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/f93ca9ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/f93ca9ce
Branch: refs/heads/master
Commit: f93ca9ce803a8847a7178ff0d7c5e1631bed8f2d
Parents: 8245f9b
Author: Luke Cwik <lc...@google.com>
Authored: Wed Sep 21 17:11:22 2016 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Thu Sep 22 14:37:00 2016 -0700
----------------------------------------------------------------------
pom.xml | 30 ++++++++++++++++++++-----
sdks/java/core/pom.xml | 17 +-------------
sdks/java/io/google-cloud-platform/pom.xml | 2 +-
3 files changed, 27 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f93ca9ce/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fb3a8a4..70373ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,19 +103,19 @@
<!-- If updating dependencies, please update any relevant javadoc offlineLinks -->
<avro.version>1.8.1</avro.version>
<bigquery.version>v2-rev295-1.22.0</bigquery.version>
- <pubsubgrpc.version>0.0.2</pubsubgrpc.version>
+ <pubsubgrpc.version>0.1.0</pubsubgrpc.version>
<clouddebugger.version>v2-rev8-1.22.0</clouddebugger.version>
<dataflow.version>v1b3-rev36-1.22.0</dataflow.version>
<dataflow.proto.version>0.5.160222</dataflow.proto.version>
- <datastore.client.version>1.1.0</datastore.client.version>
- <datastore.proto.version>1.0.1</datastore.proto.version>
+ <datastore.client.version>1.2.0</datastore.client.version>
+ <datastore.proto.version>1.2.0</datastore.proto.version>
<google-auto-service.version>1.0-rc2</google-auto-service.version>
<google-auto-value.version>1.1</google-auto-value.version>
<google-clients.version>1.22.0</google-clients.version>
<google-cloud-bigdataoss.version>1.4.5</google-cloud-bigdataoss.version>
<google-cloud-dataflow-java-proto-library-all.version>0.5.160304</google-cloud-dataflow-java-proto-library-all.version>
<guava.version>19.0</guava.version>
- <grpc.version>0.14.1</grpc.version>
+ <grpc.version>1.0.1</grpc.version>
<hamcrest.version>1.3</hamcrest.version>
<jackson.version>2.7.2</jackson.version>
<findbugs.version>3.0.1</findbugs.version>
@@ -124,7 +124,7 @@
<mockito.version>1.9.5</mockito.version>
<netty.version>4.1.1.Final</netty.version>
<os-maven-plugin.version>1.4.0.Final</os-maven-plugin.version>
- <protobuf.version>3.0.0-beta-1</protobuf.version>
+ <protobuf.version>3.0.0</protobuf.version>
<pubsub.version>v1-rev10-1.22.0</pubsub.version>
<slf4j.version>1.7.14</slf4j.version>
<stax2.version>3.1.4</stax2.version>
@@ -470,6 +470,26 @@
</dependency>
<dependency>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>grpc-google-pubsub-v1</artifactId>
+ <version>${pubsubgrpc.version}</version>
+ <exclusions>
+ <!-- Exclude an old version of guava that is being pulled in by a transitive
+ dependency of google-api-client -->
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava-jdk5</artifactId>
+ </exclusion>
+ <!-- grpc-all does not obey IWYU, so we need to exclude from compile
+ scope and depend on it at runtime. -->
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-all</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-storage</artifactId>
<version>${storage.version}</version>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f93ca9ce/sdks/java/core/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml
index 78aec85..1cf7ba5 100644
--- a/sdks/java/core/pom.xml
+++ b/sdks/java/core/pom.xml
@@ -337,22 +337,7 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
- <artifactId>grpc-pubsub-v1</artifactId>
- <version>${pubsubgrpc.version}</version>
- <exclusions>
- <!-- Exclude an old version of guava that is being pulled in by a transitive
- dependency of google-api-client -->
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava-jdk5</artifactId>
- </exclusion>
- <!-- grpc-all does not obey IWYU, so we need to exclude from compile
- scope and depend on it at runtime. -->
- <exclusion>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-all</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>grpc-google-pubsub-v1</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f93ca9ce/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 8075335..a0f3fef 100644
--- a/sdks/java/io/google-cloud-platform/pom.xml
+++ b/sdks/java/io/google-cloud-platform/pom.xml
@@ -32,7 +32,7 @@
<packaging>jar</packaging>
<properties>
- <bigtable.version>0.9.1</bigtable.version>
+ <bigtable.version>0.9.2</bigtable.version>
</properties>
<build>