Repository: incubator-htrace Updated Branches: refs/heads/master 2a77c8801 -> 43ce2136a
HTRACE-276. Shade classes into org.apache.htrace.shaded rather than org.apache.htrace (cmccabe) Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/43ce2136 Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/43ce2136 Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/43ce2136 Branch: refs/heads/master Commit: 43ce2136a3c4bd8f2eeb296d2b1d4d0d516c3088 Parents: 2a77c88 Author: Colin P. Mccabe <[email protected]> Authored: Tue Oct 6 10:19:40 2015 -0700 Committer: Colin P. Mccabe <[email protected]> Committed: Tue Oct 6 10:19:40 2015 -0700 ---------------------------------------------------------------------- htrace-core4/pom.xml | 4 ++-- htrace-hbase/pom.xml | 8 ++++---- htrace-htraced/pom.xml | 6 +++--- htrace-zipkin/pom.xml | 18 +++++++++--------- 4 files changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/43ce2136/htrace-core4/pom.xml ---------------------------------------------------------------------- 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 @@ language governing permissions and limitations under the License. --> <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> http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/43ce2136/htrace-hbase/pom.xml ---------------------------------------------------------------------- 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 @@ language governing permissions and limitations under the License. --> <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> http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/43ce2136/htrace-htraced/pom.xml ---------------------------------------------------------------------- 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 @@ language governing permissions and limitations under the License. --> <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> http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/43ce2136/htrace-zipkin/pom.xml ---------------------------------------------------------------------- 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 @@ language governing permissions and limitations under the License. --> <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>
