This is an automated email from the ASF dual-hosted git repository.
psomogyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase-thirdparty.git
The following commit(s) were added to refs/heads/master by this push:
new 324f3c1 HBASE-22233 Add error prone annotations dependency explicitly
and do not relocate it
324f3c1 is described below
commit 324f3c1ecad5ff43707c6ef8f040d4be04d9274e
Author: Peter Somogyi <[email protected]>
AuthorDate: Sat Apr 13 21:59:35 2019 +0200
HBASE-22233 Add error prone annotations dependency explicitly and do not
relocate it
---
hbase-shaded-miscellaneous/pom.xml | 24 +++++++++++++++++++-----
hbase-shaded-netty/pom.xml | 3 ---
hbase-shaded-protobuf/pom.xml | 3 ---
pom.xml | 2 +-
4 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/hbase-shaded-miscellaneous/pom.xml
b/hbase-shaded-miscellaneous/pom.xml
index 1e93600..84579d9 100644
--- a/hbase-shaded-miscellaneous/pom.xml
+++ b/hbase-shaded-miscellaneous/pom.xml
@@ -70,11 +70,20 @@
<createSourcesJar>true</createSourcesJar>
<relocations>
<relocation>
- <pattern>com.google</pattern>
- <shadedPattern>${rename.offset}.com.google</shadedPattern>
- <excludes>
-
<exclude>com.google.errorprone.annotations.CanIgnoreReturnValue</exclude>
- </excludes>
+ <pattern>com.google.common</pattern>
+
<shadedPattern>${rename.offset}.com.google.common</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.google.gson</pattern>
+
<shadedPattern>${rename.offset}.com.google.gson</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.google.protobuf</pattern>
+
<shadedPattern>${rename.offset}.com.google.protobuf</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.google.thirdparty</pattern>
+
<shadedPattern>${rename.offset}.com.google.thirdparty</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.commons</pattern>
@@ -172,5 +181,10 @@
<artifactId>commons-collections4</artifactId>
<version>4.3</version>
</dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <version>2.3.3</version>
+ </dependency>
</dependencies>
</project>
diff --git a/hbase-shaded-netty/pom.xml b/hbase-shaded-netty/pom.xml
index b9ac1d5..8f59434 100644
--- a/hbase-shaded-netty/pom.xml
+++ b/hbase-shaded-netty/pom.xml
@@ -71,9 +71,6 @@
<relocation>
<pattern>io.netty</pattern>
<shadedPattern>${rename.offset}.io.netty</shadedPattern>
- <excludes>
-
<exclude>com.google.errorprone.annotations.CanIgnoreReturnValue</exclude>
- </excludes>
</relocation>
</relocations>
<artifactSet>
diff --git a/hbase-shaded-protobuf/pom.xml b/hbase-shaded-protobuf/pom.xml
index e3b438a..429a06f 100644
--- a/hbase-shaded-protobuf/pom.xml
+++ b/hbase-shaded-protobuf/pom.xml
@@ -158,9 +158,6 @@
<relocation>
<pattern>com.google.protobuf</pattern>
<shadedPattern>${rename.offset}.com.google.protobuf</shadedPattern>
- <excludes>
-
<exclude>com.google.errorprone.annotations.CanIgnoreReturnValue</exclude>
- </excludes>
</relocation>
<!-- Our protos depend on the protos at this location.
TODO: We should move off depending on them and then
diff --git a/pom.xml b/pom.xml
index bff04b9..501bb9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
<java.min.version>${compileSource}</java.min.version>
<maven.min.version>3.3.3</maven.min.version>
<rename.offset>org.apache.hbase.thirdparty</rename.offset>
- <protobuf.version>3.7.0</protobuf.version>
+ <protobuf.version>3.7.1</protobuf.version>
</properties>
<build>
<pluginManagement>
