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/07/21 16:19:01 UTC
[1/2] incubator-beam git commit: BigtableIO: upgrade to 0.9.1
Repository: incubator-beam
Updated Branches:
refs/heads/master 6d5e8186a -> 0eb81fdc1
BigtableIO: upgrade to 0.9.1
* Use the uber jar
* Remove OS classifier mumbo jumbo
* Move common dependency versioning to root pom
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/ae214419
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/ae214419
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/ae214419
Branch: refs/heads/master
Commit: ae2144196c351cc2ee544e030d793929d8607696
Parents: 6d5e818
Author: Dan Halperin <dh...@google.com>
Authored: Wed Jul 20 10:26:02 2016 -0700
Committer: Luke Cwik <lc...@visitor-lcwik.wat.corp.google.com>
Committed: Thu Jul 21 11:26:06 2016 -0400
----------------------------------------------------------------------
examples/java/pom.xml | 11 -------
pom.xml | 33 +++++++++++++++++++-
runners/spark/pom.xml | 11 -------
sdks/java/core/pom.xml | 25 ++++++++++++++-
sdks/java/io/google-cloud-platform/pom.xml | 17 ++--------
.../main/resources/archetype-resources/pom.xml | 11 -------
6 files changed, 59 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ae214419/examples/java/pom.xml
----------------------------------------------------------------------
diff --git a/examples/java/pom.xml b/examples/java/pom.xml
index 82ddea8..c1ea140 100644
--- a/examples/java/pom.xml
+++ b/examples/java/pom.xml
@@ -195,17 +195,6 @@
</executions>
</plugin>
</plugins>
-
- <extensions>
- <!-- Use os-maven-plugin to initialize the "os.detected" properties for Bigtable
- in beam-sdks-java-io-google-cloud-platform.
- See: https://cloud.google.com/bigtable/docs/using-maven#encryption -->
- <extension>
- <groupId>kr.motd.maven</groupId>
- <artifactId>os-maven-plugin</artifactId>
- <version>${os-maven-plugin.version}</version>
- </extension>
- </extensions>
</build>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ae214419/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5e89403..b26d238 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,13 +115,14 @@
<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.13.1</grpc.version>
+ <grpc.version>0.14.1</grpc.version>
<hamcrest.version>1.3</hamcrest.version>
<jackson.version>2.7.2</jackson.version>
<findbugs.version>3.0.1</findbugs.version>
<joda.version>2.4</joda.version>
<junit.version>4.11</junit.version>
<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>
<pubsub.version>v1-rev10-1.22.0</pubsub.version>
@@ -279,6 +280,30 @@
</dependency>
<dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-auth</artifactId>
+ <version>${grpc.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-core</artifactId>
+ <version>${grpc.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-netty</artifactId>
+ <version>${grpc.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client</artifactId>
<version>${google-clients.version}</version>
@@ -546,6 +571,12 @@
</dependency>
<dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>${avro.version}</version>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ae214419/runners/spark/pom.xml
----------------------------------------------------------------------
diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml
index 0b26ef8..7f65e16 100644
--- a/runners/spark/pom.xml
+++ b/runners/spark/pom.xml
@@ -393,17 +393,6 @@
<artifactId>maven-shade-plugin</artifactId>
</plugin>
</plugins>
- <extensions>
- <!-- Use os-maven-plugin to initialize the "os.detected" properties for Bigtable
- in beam-sdks-java-io-google-cloud-platform, which examples depend on, hence
- the Spark runner depends upon.
- See: https://cloud.google.com/bigtable/docs/using-maven#encryption -->
- <extension>
- <groupId>kr.motd.maven</groupId>
- <artifactId>os-maven-plugin</artifactId>
- <version>${os-maven-plugin.version}</version>
- </extension>
- </extensions>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ae214419/sdks/java/core/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml
index a2c7c5c..8b1751c 100644
--- a/sdks/java/core/pom.xml
+++ b/sdks/java/core/pom.xml
@@ -291,7 +291,25 @@
<dependencies>
<dependency>
<groupId>io.grpc</groupId>
+ <artifactId>grpc-auth</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-netty</artifactId>
+ </dependency>
+
+ <!-- grpc-all does not obey IWYU, so we need to exclude from compile
+ scope and depend on it at runtime. -->
+ <dependency>
+ <groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
@@ -311,7 +329,6 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
- <version>4.1.0.CR1</version>
</dependency>
<dependency>
@@ -325,6 +342,12 @@
<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>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ae214419/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 4ee83cf..6b524df 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.0</bigtable.version>
+ <bigtable.version>0.9.1</bigtable.version>
</properties>
<build>
@@ -86,16 +86,6 @@
</executions>
</plugin>
</plugins>
-
- <extensions>
- <!-- Use os-maven-plugin to initialize the "os.detected" properties for Bigtable.
- See: https://cloud.google.com/bigtable/docs/using-maven#encryption -->
- <extension>
- <groupId>kr.motd.maven</groupId>
- <artifactId>os-maven-plugin</artifactId>
- <version>${os-maven-plugin.version}</version>
- </extension>
- </extensions>
</build>
<dependencies>
@@ -133,7 +123,7 @@
<dependency>
<groupId>io.grpc</groupId>
- <artifactId>grpc-all</artifactId>
+ <artifactId>grpc-core</artifactId>
</dependency>
<dependency>
@@ -208,8 +198,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
- <version>1.1.33.Fork13</version>
- <classifier>${os.detected.classifier}</classifier>
+ <version>1.1.33.Fork18</version>
<scope>runtime</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ae214419/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
index 8677755..db7b899 100644
--- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
+++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
@@ -101,17 +101,6 @@
</plugin>
</plugins>
</pluginManagement>
-
- <extensions>
- <!-- Use os-maven-plugin to initialize the "os.detected" properties for Bigtable
- in beam-sdks-java-io-google-cloud-platform.
- See: https://cloud.google.com/bigtable/docs/using-maven#encryption -->
- <extension>
- <groupId>kr.motd.maven</groupId>
- <artifactId>os-maven-plugin</artifactId>
- <version>1.4.0.Final</version>
- </extension>
- </extensions>
</build>
<dependencies>
[2/2] incubator-beam git commit: [BEAM-445] BigtableIO: upgrade to
0.9.1
Posted by lc...@apache.org.
[BEAM-445] BigtableIO: upgrade to 0.9.1
This closes #701
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/0eb81fdc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/0eb81fdc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/0eb81fdc
Branch: refs/heads/master
Commit: 0eb81fdc15bc3dce28e24e73427bd389e0f6d60d
Parents: 6d5e818 ae21441
Author: Luke Cwik <lc...@visitor-lcwik.wat.corp.google.com>
Authored: Thu Jul 21 11:26:41 2016 -0400
Committer: Luke Cwik <lc...@visitor-lcwik.wat.corp.google.com>
Committed: Thu Jul 21 11:26:41 2016 -0400
----------------------------------------------------------------------
examples/java/pom.xml | 11 -------
pom.xml | 33 +++++++++++++++++++-
runners/spark/pom.xml | 11 -------
sdks/java/core/pom.xml | 25 ++++++++++++++-
sdks/java/io/google-cloud-platform/pom.xml | 17 ++--------
.../main/resources/archetype-resources/pom.xml | 11 -------
6 files changed, 59 insertions(+), 49 deletions(-)
----------------------------------------------------------------------