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 2017/04/24 23:46:29 UTC
[1/2] beam git commit: Properly Declare Protobuf extension
dependencies
Repository: beam
Updated Branches:
refs/heads/master 57535f35e -> 02e60a5c5
Properly Declare Protobuf extension dependencies
Import the correct ProtoCoder in BigtableIO
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/c4439862
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/c4439862
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/c4439862
Branch: refs/heads/master
Commit: c4439862efc723237c7005952f8b8bdb9075d8e7
Parents: 57535f3
Author: Thomas Groh <tg...@google.com>
Authored: Mon Apr 24 16:05:28 2017 -0700
Committer: Thomas Groh <tg...@google.com>
Committed: Mon Apr 24 16:10:38 2017 -0700
----------------------------------------------------------------------
pom.xml | 6 ++++++
sdks/java/io/google-cloud-platform/pom.xml | 5 +++++
.../java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIO.java | 2 +-
.../org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java | 2 +-
4 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/c4439862/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8723ed9..aec434e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -358,6 +358,12 @@
<dependency>
<groupId>org.apache.beam</groupId>
+ <artifactId>beam-sdks-java-extensions-protobuf</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.beam</groupId>
<artifactId>beam-sdks-java-extensions-gcp-core</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/beam/blob/c4439862/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 3778a63..7fa3842 100644
--- a/sdks/java/io/google-cloud-platform/pom.xml
+++ b/sdks/java/io/google-cloud-platform/pom.xml
@@ -72,6 +72,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>beam-sdks-java-extensions-protobuf</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/beam/blob/c4439862/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIO.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIO.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIO.java
index 28f8878..7bba1a6 100644
--- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIO.java
+++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIO.java
@@ -44,7 +44,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
import javax.annotation.Nullable;
import org.apache.beam.sdk.annotations.Experimental;
import org.apache.beam.sdk.coders.Coder;
-import org.apache.beam.sdk.coders.protobuf.ProtoCoder;
+import org.apache.beam.sdk.extensions.protobuf.ProtoCoder;
import org.apache.beam.sdk.io.BoundedSource;
import org.apache.beam.sdk.io.BoundedSource.BoundedReader;
import org.apache.beam.sdk.io.range.ByteKey;
http://git-wip-us.apache.org/repos/asf/beam/blob/c4439862/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java
index 713a9a9..cf96b65 100644
--- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java
+++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java
@@ -78,7 +78,7 @@ import org.apache.beam.sdk.coders.ByteStringCoder;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.IterableCoder;
import org.apache.beam.sdk.coders.KvCoder;
-import org.apache.beam.sdk.coders.protobuf.ProtoCoder;
+import org.apache.beam.sdk.extensions.protobuf.ProtoCoder;
import org.apache.beam.sdk.io.BoundedSource.BoundedReader;
import org.apache.beam.sdk.io.gcp.bigtable.BigtableIO.BigtableSource;
import org.apache.beam.sdk.io.range.ByteKey;
[2/2] beam git commit: Properly Declare Protobuf extension
dependencies
Posted by lc...@apache.org.
Properly Declare Protobuf extension dependencies
This closes #2669
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/02e60a5c
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/02e60a5c
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/02e60a5c
Branch: refs/heads/master
Commit: 02e60a5c5b05604b6c94198b1338cad09228c92d
Parents: 57535f3 c443986
Author: Luke Cwik <lc...@google.com>
Authored: Mon Apr 24 16:46:16 2017 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Mon Apr 24 16:46:16 2017 -0700
----------------------------------------------------------------------
pom.xml | 6 ++++++
sdks/java/io/google-cloud-platform/pom.xml | 5 +++++
.../java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIO.java | 2 +-
.../org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java | 2 +-
4 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------