HBASE-19170 Change relocation offset of 3rd party artifacts
diff --git a/README.txt b/README.txt
index 8e15f0b..4b27f55 100644
--- a/README.txt
+++ b/README.txt
@@ -14,7 +14,7 @@
is also libs that depend on each other and are awkward to disentangle.
All shading is done using the same relocation offset of
-org.apache.hadoop.hbase.shaded; we add this prefix to the relocated thirdparty
+org.apache.hbase.thirdparty. We add this prefix to the relocated thirdparty
library class names.
See the pom.xml for the explicit version of each third-party lib included.
diff --git a/hbase-shaded-netty/pom.xml b/hbase-shaded-netty/pom.xml
index a8b9c4a..9726c68 100644
--- a/hbase-shaded-netty/pom.xml
+++ b/hbase-shaded-netty/pom.xml
@@ -102,7 +102,7 @@
Add this define when running unit tests:
- mvn test -Dorg.apache.hadoop.hbase.shaded.io.netty.packagePrefix=org.apache.hadoop.hbase.shaded. -Dtest=TestNettyIPC
+ mvn test -Dorg.apache.hbase.thirdparty.io.netty.packagePrefix=org.apache.hbase.thirdparty. -Dtest=TestNettyIPC
See toward the end of this issue for how to pass config:
@@ -126,7 +126,7 @@
dest="${project.build.directory}/unpacked/"/>
<echo message="Rename netty .so in META-INF"/>
<move file="${project.build.directory}/unpacked/META-INF/native/libnetty-transport-native-epoll.so"
- tofile="${project.build.directory}/unpacked/META-INF/native/liborg-apache-hadoop-hbase-shaded-netty-transport-native-epoll.so" />
+ tofile="${project.build.directory}/unpacked/META-INF/native/liborg-apache-hbase-thirdparty-netty-transport-native-epoll.so" />
<echo message="Redo jar"/>
<jar destfile="${project.build.directory}/${project.artifactId}-${project.version}.jar"
basedir="${project.build.directory}/unpacked"/>
diff --git a/pom.xml b/pom.xml
index 6818561..fc84687 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
<compileSource>1.8</compileSource>
<java.min.version>${compileSource}</java.min.version>
<maven.min.version>3.3.3</maven.min.version>
- <rename.offset>org.apache.hadoop.hbase.shaded</rename.offset>
+ <rename.offset>org.apache.hbase.thirdparty</rename.offset>
</properties>
<build>
<pluginManagement>
