From a7697a9e7e1158c41bae65fe66f82f7b2ab1450c Mon Sep 17 00:00:00 2001
From: Angus Davis <angusdavis@google.com>
Date: Thu, 16 Oct 2014 14:27:38 -0700
Subject: [PATCH] Use repackaged proto

---
 pom.xml                                       | 78 -------------------
 .../cloud/anviltop/hbase/BatchExecutor.java   |  2 +-
 .../hbase/adapters/OperationAdapter.java      |  2 +-
 .../hbase/adapters/ResponseAdapter.java       |  2 +-
 4 files changed, 3 insertions(+), 81 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8457b20eb1..0f0fc23669 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,13 +45,6 @@
                             <groupId>com.google.guava</groupId>
                             <artifactId>guava</artifactId>
                         </exclusion>
-                        <!-- The generated messages in the anviltop driver depend on an unreleased
-                         version of protobuf-java. We can shade our references into the client
-                         when grpc is opened. -->
-                        <exclusion>
-                            <groupId>com.google.protobuf</groupId>
-                            <artifactId>protobuf-java</artifactId>
-                        </exclusion>
                     </exclusions>
                 </dependency>
                 <dependency>
@@ -75,13 +68,6 @@
                             <groupId>com.google.guava</groupId>
                             <artifactId>guava</artifactId>
                         </exclusion>
-                        <!-- The generated messages in the anviltop driver depend on an unreleased
-                         version of protobuf-java. We can shade our references into the client
-                         when grpc is opened. -->
-                        <exclusion>
-                            <groupId>com.google.protobuf</groupId>
-                            <artifactId>protobuf-java</artifactId>
-                        </exclusion>
                     </exclusions>
                 </dependency>
                 <dependency>
@@ -97,10 +83,6 @@
                         <!-- The generated messages in the anviltop driver depend on an unreleased
                          version of protobuf-java. We can shade our references into the client
                          when grpc is opened. -->
-                        <exclusion>
-                            <groupId>com.google.protobuf</groupId>
-                            <artifactId>protobuf-java</artifactId>
-                        </exclusion>
                     </exclusions>
                 </dependency>
                 <dependency>
@@ -128,10 +110,6 @@
                         <!-- The generated messages in the anviltop driver depend on an unreleased
                          version of protobuf-java. We can shade our references into the client
                          when grpc is opened. -->
-                        <exclusion>
-                            <groupId>com.google.protobuf</groupId>
-                            <artifactId>protobuf-java</artifactId>
-                        </exclusion>
                     </exclusions>
                 </dependency>
                 <dependency>
@@ -148,10 +126,6 @@
                         <!-- The generated messages in the anviltop driver depend on an unreleased
                          version of protobuf-java. We can shade our references into the client
                          when grpc is opened. -->
-                        <exclusion>
-                            <groupId>com.google.protobuf</groupId>
-                            <artifactId>protobuf-java</artifactId>
-                        </exclusion>
                     </exclusions>
                 </dependency>
                 <dependency>
@@ -179,10 +153,6 @@
                         <!-- The generated messages in the anviltop driver depend on an unreleased
                          version of protobuf-java. We can shade our references into the client
                          when grpc is opened. -->
-                        <exclusion>
-                            <groupId>com.google.protobuf</groupId>
-                            <artifactId>protobuf-java</artifactId>
-                        </exclusion>
                     </exclusions>
                 </dependency>
                 <dependency>
@@ -202,10 +172,6 @@
                         <!-- The generated messages in the anviltop driver depend on an unreleased
                          version of protobuf-java. We can shade our references into the client
                          when grpc is opened. -->
-                        <exclusion>
-                            <groupId>com.google.protobuf</groupId>
-                            <artifactId>protobuf-java</artifactId>
-                        </exclusion>
                     </exclusions>
                 </dependency>
                 <dependency>
@@ -222,10 +188,6 @@
                         <!-- The generated messages in the anviltop driver depend on an unreleased
                          version of protobuf-java. We can shade our references into the client
                          when grpc is opened. -->
-                        <exclusion>
-                            <groupId>com.google.protobuf</groupId>
-                            <artifactId>protobuf-java</artifactId>
-                        </exclusion>
                     </exclusions>
                 </dependency>
                 <dependency>
@@ -242,10 +204,6 @@
                         <!-- The generated messages in the anviltop driver depend on an unreleased
                          version of protobuf-java. We can shade our references into the client
                          when grpc is opened. -->
-                        <exclusion>
-                            <groupId>com.google.protobuf</groupId>
-                            <artifactId>protobuf-java</artifactId>
-                        </exclusion>
                     </exclusions>
                 </dependency>
             </dependencies>
@@ -299,10 +257,6 @@
                 <!-- The generated messages in the anviltop driver depend on an unreleased
                  version of protobuf-java. We can shade our references into the client
                  when grpc is opened. -->
-                <exclusion>
-                    <groupId>com.google.protobuf</groupId>
-                    <artifactId>protobuf-java</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -337,10 +291,6 @@
                 <!-- The generated messages in the anviltop driver depend on an unreleased
                  version of protobuf-java. We can shade our references into the client
                  when grpc is opened. -->
-                <exclusion>
-                    <groupId>com.google.protobuf</groupId>
-                    <artifactId>protobuf-java</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -352,10 +302,6 @@
                 <!-- The generated messages in the anviltop driver depend on an unreleased
                  version of protobuf-java. We can shade our references into the client
                  when grpc is opened. -->
-                <exclusion>
-                    <groupId>com.google.protobuf</groupId>
-                    <artifactId>protobuf-java</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -368,10 +314,6 @@
                 <!-- The generated messages in the anviltop driver depend on an unreleased
                  version of protobuf-java. We can shade our references into the client
                  when grpc is opened. -->
-                <exclusion>
-                    <groupId>com.google.protobuf</groupId>
-                    <artifactId>protobuf-java</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -384,10 +326,6 @@
                 <!-- The generated messages in the anviltop driver depend on an unreleased
                  version of protobuf-java. We can shade our references into the client
                  when grpc is opened. -->
-                <exclusion>
-                    <groupId>com.google.protobuf</groupId>
-                    <artifactId>protobuf-java</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -400,10 +338,6 @@
                 <!-- The generated messages in the anviltop driver depend on an unreleased
                  version of protobuf-java. We can shade our references into the client
                  when grpc is opened. -->
-                <exclusion>
-                    <groupId>com.google.protobuf</groupId>
-                    <artifactId>protobuf-java</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -416,10 +350,6 @@
                 <!-- The generated messages in the anviltop driver depend on an unreleased
                  version of protobuf-java. We can shade our references into the client
                  when grpc is opened. -->
-                <exclusion>
-                    <groupId>com.google.protobuf</groupId>
-                    <artifactId>protobuf-java</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -432,10 +362,6 @@
                 <!-- The generated messages in the anviltop driver depend on an unreleased
                  version of protobuf-java. We can shade our references into the client
                  when grpc is opened. -->
-                <exclusion>
-                    <groupId>com.google.protobuf</groupId>
-                    <artifactId>protobuf-java</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -448,10 +374,6 @@
                 <!-- The generated messages in the anviltop driver depend on an unreleased
                  version of protobuf-java. We can shade our references into the client
                  when grpc is opened. -->
-                <exclusion>
-                    <groupId>com.google.protobuf</groupId>
-                    <artifactId>protobuf-java</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/src/main/java/com/google/cloud/anviltop/hbase/BatchExecutor.java b/src/main/java/com/google/cloud/anviltop/hbase/BatchExecutor.java
index e9368aacbc..b01eb0c972 100644
--- a/src/main/java/com/google/cloud/anviltop/hbase/BatchExecutor.java
+++ b/src/main/java/com/google/cloud/anviltop/hbase/BatchExecutor.java
@@ -18,7 +18,7 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-import com.google.protobuf.GeneratedMessage;
+import com.google.cloud.hadoop.hbase.repackaged.protobuf.GeneratedMessage;
 import com.google.protobuf.ServiceException;
 
 import org.apache.hadoop.hbase.TableName;
diff --git a/src/main/java/com/google/cloud/anviltop/hbase/adapters/OperationAdapter.java b/src/main/java/com/google/cloud/anviltop/hbase/adapters/OperationAdapter.java
index 5de336095c..2b2a1cafe4 100644
--- a/src/main/java/com/google/cloud/anviltop/hbase/adapters/OperationAdapter.java
+++ b/src/main/java/com/google/cloud/anviltop/hbase/adapters/OperationAdapter.java
@@ -13,7 +13,7 @@
  */
 package com.google.cloud.anviltop.hbase.adapters;
 
-import com.google.protobuf.GeneratedMessage.Builder;
+import com.google.cloud.hadoop.hbase.repackaged.protobuf.GeneratedMessage.Builder;
 
 import org.apache.hadoop.hbase.client.Operation;
 
diff --git a/src/main/java/com/google/cloud/anviltop/hbase/adapters/ResponseAdapter.java b/src/main/java/com/google/cloud/anviltop/hbase/adapters/ResponseAdapter.java
index 8c8cb0c314..fc2af11098 100644
--- a/src/main/java/com/google/cloud/anviltop/hbase/adapters/ResponseAdapter.java
+++ b/src/main/java/com/google/cloud/anviltop/hbase/adapters/ResponseAdapter.java
@@ -13,7 +13,7 @@
  */
 package com.google.cloud.anviltop.hbase.adapters;
 
-import com.google.protobuf.GeneratedMessage;
+import com.google.cloud.hadoop.hbase.repackaged.protobuf.GeneratedMessage;
 
 import org.apache.hadoop.hbase.client.Result;