From 54c933ba6c8a12e790f0b3b3d9d0aa100d3f1451 Mon Sep 17 00:00:00 2001
From: Daniel Mills <millsd@google.com>
Date: Fri, 4 Mar 2016 15:39:45 -0800
Subject: [PATCH] Update sdk pregenerated protos to 0.5.160304

Make pre-generated proto libraries a test-only dep
---
 sdk/pom.xml                                         | 13 +++++++------
 .../dataflow/sdk/coders/protobuf/ProtoCoder.java    |  7 +------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/sdk/pom.xml b/sdk/pom.xml
index c1587965f16c4..8e7b4634b4328 100644
--- a/sdk/pom.xml
+++ b/sdk/pom.xml
@@ -452,12 +452,6 @@
       </exclusions>
     </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>
@@ -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>
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 d8c8e9e2438ef..9e4bb502c780f 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.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 static <T extends Message> ProtoCoder<T> of(TypeDescriptor<T> protoMessag
    * 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.
    */