HTRACE-276. Shade classes into org.apache.htrace.shaded rather than org.apache.htrace (cmccabe)
diff --git a/htrace-core4/pom.xml b/htrace-core4/pom.xml
index b5d3c74..77e9b46 100644
--- a/htrace-core4/pom.xml
+++ b/htrace-core4/pom.xml
@@ -51,11 +51,11 @@
<relocations>
<relocation>
<pattern>org.apache.commons.logging</pattern>
- <shadedPattern>org.apache.htrace.commons.logging</shadedPattern>
+ <shadedPattern>org.apache.htrace.shaded.commons.logging</shadedPattern>
</relocation>
<relocation>
<pattern>com.fasterxml.jackson</pattern>
- <shadedPattern>org.apache.htrace.fasterxml.jackson</shadedPattern>
+ <shadedPattern>org.apache.htrace.shaded.fasterxml.jackson</shadedPattern>
</relocation>
</relocations>
</configuration>
diff --git a/htrace-hbase/pom.xml b/htrace-hbase/pom.xml
index 4c27d71..549f651 100644
--- a/htrace-hbase/pom.xml
+++ b/htrace-hbase/pom.xml
@@ -78,19 +78,19 @@
<relocations>
<relocation>
<pattern>org.apache.commons.logging</pattern>
- <shadedPattern>org.apache.htrace.commons.logging</shadedPattern>
+ <shadedPattern>org.apache.htrace.shaded.commons.logging</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.protobuf</pattern>
- <shadedPattern>org.apache.htrace.com.google.protobuf</shadedPattern>
+ <shadedPattern>org.apache.htrace.shaded.com.google.protobuf</shadedPattern>
</relocation>
<relocation>
<pattern>org.eclipse.jetty</pattern>
- <shadedPattern>org.apache.htrace.org.eclipse.jetty</shadedPattern>
+ <shadedPattern>org.apache.htrace.shaded.org.eclipse.jetty</shadedPattern>
</relocation>
<relocation>
<pattern>javax.servlet</pattern>
- <shadedPattern>org.apache.htrace.javax.servlet</shadedPattern>
+ <shadedPattern>org.apache.htrace.shaded.javax.servlet</shadedPattern>
</relocation>
</relocations>
</configuration>
diff --git a/htrace-htraced/pom.xml b/htrace-htraced/pom.xml
index 685a7af..88fd2fc 100644
--- a/htrace-htraced/pom.xml
+++ b/htrace-htraced/pom.xml
@@ -76,15 +76,15 @@
<relocations>
<relocation>
<pattern>org.apache.commons.logging</pattern>
- <shadedPattern>org.apache.htrace.commons.logging</shadedPattern>
+ <shadedPattern>org.apache.htrace.shaded.commons.logging</shadedPattern>
</relocation>
<relocation>
<pattern>com.fasterxml.jackson</pattern>
- <shadedPattern>org.apache.htrace.fasterxml.jackson</shadedPattern>
+ <shadedPattern>org.apache.htrace.shaded.fasterxml.jackson</shadedPattern>
</relocation>
<relocation>
<pattern>org.eclipse.jetty</pattern>
- <shadedPattern>org.apache.htrace.jetty</shadedPattern>
+ <shadedPattern>org.apache.htrace.shaded.jetty</shadedPattern>
</relocation>
</relocations>
</configuration>
diff --git a/htrace-zipkin/pom.xml b/htrace-zipkin/pom.xml
index 77bba02..44424ff 100644
--- a/htrace-zipkin/pom.xml
+++ b/htrace-zipkin/pom.xml
@@ -63,47 +63,47 @@
<relocation>
<pattern>org.apache.commons.logging</pattern>
- <shadedPattern>org.apache.htrace.commons.logging</shadedPattern>
+ <shadedPattern>org.apache.htrace.shaded.commons.logging</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.thrift</pattern>
- <shadedPattern>org.apache.htrace.thrift</shadedPattern>
+ <shadedPattern>org.apache.htrace.shaded.thrift</shadedPattern>
</relocation>
<relocation>
<pattern>org.slf4j</pattern>
- <shadedPattern>org.apache.htrace.slf4j</shadedPattern>
+ <shadedPattern>org.apache.htrace.shaded.slf4j</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.commons.codec</pattern>
- <shadedPattern>org.apache.htrace.commons.codec</shadedPattern>
+ <shadedPattern>org.apache.htrace.shaded.commons.codec</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.commons.lang</pattern>
- <shadedPattern>org.apache.htrace.commons.lang</shadedPattern>
+ <shadedPattern>org.apache.htrace.shaded.commons.lang</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.http</pattern>
- <shadedPattern>org.apache.htrace.http</shadedPattern>
+ <shadedPattern>org.apache.htrace.shaded.http</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.kafka</pattern>
- <shadedPattern>org.apache.htrace.kafka</shadedPattern>
+ <shadedPattern>org.apache.htrace.shaded.kafka</shadedPattern>
</relocation>
<relocation>
<pattern>kafka</pattern>
- <shadedPattern>org.apache.htrace.kafka</shadedPattern>
+ <shadedPattern>org.apache.htrace.shaded.kafka</shadedPattern>
</relocation>
<relocation>
<pattern>org.I0Itec</pattern>
- <shadedPattern>org.apache.htrace.I0Itec</shadedPattern>
+ <shadedPattern>org.apache.htrace.shaded.I0Itec</shadedPattern>
</relocation>
</relocations>
