Skip to content

Commit

Permalink
Use repackaged proto
Browse files Browse the repository at this point in the history
  • Loading branch information
Angus Davis committed Oct 16, 2014
1 parent 3964a6b commit a7697a9
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 81 deletions.
78 changes: 0 additions & 78 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/google/cloud/anviltop/hbase/BatchExecutor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/google/cloud/anviltop/hbase/adapters/OperationAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/google/cloud/anviltop/hbase/adapters/ResponseAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit a7697a9

Please sign in to comment.