Repository: kylin Updated Branches: refs/heads/KYLIN-2428 e9024fbb4 -> bce09a881
KYLIN-2428 fix shade Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/bce09a88 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/bce09a88 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/bce09a88 Branch: refs/heads/KYLIN-2428 Commit: bce09a881beab57fe2609e37b5a52df0a5a1d048 Parents: e9024fb Author: Billy Liu <billy...@apache.org> Authored: Thu Feb 9 23:02:26 2017 +0800 Committer: Billy Liu <billy...@apache.org> Committed: Thu Feb 9 23:02:26 2017 +0800 ---------------------------------------------------------------------- assembly/pom.xml | 44 ++++++++++++++++++++++++++++++++++++++------ tool/pom.xml | 12 ++++++++---- 2 files changed, 46 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/bce09a88/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index 7d895fc..e8d933e 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -188,16 +188,48 @@ </artifactSet> <relocations> <relocation> - <pattern>com</pattern> - <shadedPattern>${shadeBase}.com</shadedPattern> + <pattern>com.fasterxml.jackson</pattern> + <shadedPattern>${shadeBase}.com.fasterxml.jackson</shadedPattern> </relocation> <relocation> - <pattern>javax</pattern> - <shadedPattern>${shadeBase}.javax</shadedPattern> + <pattern>com.sun.activation</pattern> + <shadedPattern>${shadeBase}.com.sun.activation</shadedPattern> </relocation> <relocation> - <pattern>org.apache.commons</pattern> - <shadedPattern>${shadeBase}.org.apache.commons</shadedPattern> + <pattern>com.tdunning</pattern> + <shadedPattern>${shadeBase}.com.tdunning</shadedPattern> + </relocation> + <relocation> + <pattern>com.fasterxml.jackson</pattern> + <shadedPattern>${shadeBase}.com.fasterxml.jackson</shadedPattern> + </relocation> + <relocation> + <pattern>javax.activation</pattern> + <shadedPattern>${shadeBase}.javax.activation</shadedPattern> + </relocation> + <relocation> + <pattern>javax.mail</pattern> + <shadedPattern>${shadeBase}.javax.mail</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.commons.codec</pattern> + <shadedPattern>${shadeBase}.org.apache.commons.codec</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.commons.collections</pattern> + <shadedPattern>${shadeBase}.org.apache.commons.collections</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.commons.lang3</pattern> + <shadedPattern>${shadeBase}.org.apache.commons.lang3</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.commons.logging</pattern> + <shadedPattern>${shadeBase}.org.apache.commons.logging</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.commons.mail</pattern> + <shadedPattern>${shadeBase}.org.apache.commons.mail</shadedPattern> </relocation> <relocation> <pattern>org.roaringbitmap</pattern> http://git-wip-us.apache.org/repos/asf/kylin/blob/bce09a88/tool/pom.xml ---------------------------------------------------------------------- diff --git a/tool/pom.xml b/tool/pom.xml index 70293d0..6c1df4f 100644 --- a/tool/pom.xml +++ b/tool/pom.xml @@ -142,12 +142,16 @@ </artifactSet> <relocations> <relocation> - <pattern>com</pattern> - <shadedPattern>${shadeBase}.com</shadedPattern> + <pattern>com.google.common</pattern> + <shadedPattern>${shadeBase}.com.google.common</shadedPattern> </relocation> <relocation> - <pattern>org.apache.commons</pattern> - <shadedPattern>${shadeBase}.org.apache.commons</shadedPattern> + <pattern>org.apache.commons.io</pattern> + <shadedPattern>${shadeBase}.org.apache.commons.io</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.commons.lang</pattern> + <shadedPattern>${shadeBase}.org.apache.commons.lang</shadedPattern> </relocation> <relocation> <pattern>org.apache.http</pattern>