Repository: incubator-beam Updated Branches: refs/heads/master 5d0a91b81 -> 0be5a977d
Update sdk pregenerated protos to 0.5.160304 Make pre-generated proto libraries a test-only dep Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/54c933ba Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/54c933ba Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/54c933ba Branch: refs/heads/master Commit: 54c933ba6c8a12e790f0b3b3d9d0aa100d3f1451 Parents: 5d0a91b Author: Daniel Mills <[email protected]> Authored: Fri Mar 4 15:39:45 2016 -0800 Committer: Davor Bonaci <[email protected]> Committed: Mon Mar 7 17:45:57 2016 -0800 ---------------------------------------------------------------------- sdk/pom.xml | 13 +++++++------ .../cloud/dataflow/sdk/coders/protobuf/ProtoCoder.java | 7 +------ 2 files changed, 8 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54c933ba/sdk/pom.xml ---------------------------------------------------------------------- diff --git a/sdk/pom.xml b/sdk/pom.xml index c158796..8e7b463 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -453,12 +453,6 @@ </dependency> <dependency> - <groupId>com.google.cloud.dataflow</groupId> - <artifactId>google-cloud-dataflow-java-proto-library-all</artifactId> - <version>0.5.160222</version> - </dependency> - - <dependency> <groupId>io.grpc</groupId> <artifactId>grpc-all</artifactId> <version>0.12.0</version> @@ -815,5 +809,12 @@ <version>1.10.19</version> <scope>test</scope> </dependency> + + <dependency> + <groupId>com.google.cloud.dataflow</groupId> + <artifactId>google-cloud-dataflow-java-proto-library-all</artifactId> + <version>0.5.160304</version> + <scope>test</scope> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/54c933ba/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtoCoder.java ---------------------------------------------------------------------- diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtoCoder.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtoCoder.java index d8c8e9e..9e4bb50 100644 --- a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtoCoder.java +++ b/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtoCoder.java @@ -25,8 +25,6 @@ import com.google.cloud.dataflow.sdk.coders.Coder; import com.google.cloud.dataflow.sdk.coders.CoderException; import com.google.cloud.dataflow.sdk.coders.CoderProvider; import com.google.cloud.dataflow.sdk.coders.CoderRegistry; -import com.google.cloud.dataflow.sdk.coders.Proto2CoderTestMessages; -import com.google.cloud.dataflow.sdk.coders.Proto2CoderTestMessages.MessageA; import com.google.cloud.dataflow.sdk.util.CloudObject; import com.google.cloud.dataflow.sdk.util.Structs; import com.google.cloud.dataflow.sdk.values.PCollection; @@ -147,10 +145,7 @@ public class ProtoCoder<T extends Message> extends AtomicCoder<T> { * registered. * * <p>Each of the extension host classes must be an class automatically generated by the - * Protocol Buffers compiler, {@code protoc}, that contains messages. For example, the class - * {@link Proto2CoderTestMessages} is the extension host for the {@link Message} classes - * {@link MessageA Proto2CoderTestMessages.MessageA} and the class {@link DatastoreV1} is the - * extension host for the Google Cloud Datastore {@link Entity} entity type. + * Protocol Buffers compiler, {@code protoc}, that contains messages. * * <p>Does not modify this object. */
