Skip to content
Permalink
Browse files
HBASE-22233 Add error prone annotations dependency explicitly and do …
…not relocate it
  • Loading branch information
petersomogyi committed Apr 14, 2019
1 parent 3566f78 commit 324f3c1ecad5ff43707c6ef8f040d4be04d9274e
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 12 deletions.
@@ -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>
@@ -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>
@@ -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
@@ -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>

0 comments on commit 324f3c1

Please sign in to comment.