You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2017/06/22 23:59:28 UTC
hbase-thirdparty git commit: Add in protobuf 3.3, protobuf util, and
netty 4.1.12; change relocation so it is to o.a.h.h.shaded instead of
o.a.h.thirdparty.shaded so matches other relocations
Repository: hbase-thirdparty
Updated Branches:
refs/heads/master 0b66433c7 -> 2f9ed2674
Add in protobuf 3.3, protobuf util, and netty 4.1.12; change relocation so it is to o.a.h.h.shaded instead of o.a.h.thirdparty.shaded so matches other relocations
Project: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/commit/2f9ed267
Tree: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/tree/2f9ed267
Diff: http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/diff/2f9ed267
Branch: refs/heads/master
Commit: 2f9ed2674f7e1ac9808cd40d523b45034ff553e0
Parents: 0b66433
Author: Michael Stack <st...@apache.org>
Authored: Thu Jun 22 16:59:01 2017 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Thu Jun 22 16:59:01 2017 -0700
----------------------------------------------------------------------
pom.xml | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase-thirdparty/blob/2f9ed267/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b3498be..3c1dc58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,8 +133,12 @@
<shadeSourcesContent>true</shadeSourcesContent>
<relocations>
<relocation>
+ <pattern>io.netty</pattern>
+ <shadedPattern>org.apache.hadoop.hbase.shaded.io.netty</shadedPattern>
+ </relocation>
+ <relocation>
<pattern>com.google</pattern>
- <shadedPattern>org.apache.hbase.thirdparty.shaded.com.google</shadedPattern>
+ <shadedPattern>org.apache.hadoop.hbase.shaded.com.google</shadedPattern>
</relocation>
</relocations>
<!-- What I got when I did a mvn dependency:list for this
@@ -304,10 +308,30 @@
</build>
<dependencies>
<dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.8.1</version>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>22.0</version>
</dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>${protobuf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
+ <version>${protobuf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <version>4.1.12.Final</version>
+ </dependency>
</dependencies>
<properties>
<!-- override on command line to have generated LICENSE files include
@@ -330,6 +354,7 @@
<!-- Build dependencies -->
<maven.min.version>3.0.4</maven.min.version>
<java.min.version>${compileSource}</java.min.version>
+ <protobuf.version>3.3.1</protobuf.version>
</properties>
<profiles>
<!-- this profile should be activated for release builds -->