Repository: kylin Updated Branches: refs/heads/master 4528ff630 -> 9c578e709
KYLIN-1846 minor also shade httpcomponents in jdbc Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/9c578e70 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/9c578e70 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/9c578e70 Branch: refs/heads/master Commit: 9c578e70900a0292b7cb6d0f0b1719839b8c20bb Parents: 4528ff6 Author: gaodayue <[email protected]> Authored: Mon Jul 11 10:58:06 2016 +0800 Committer: gaodayue <[email protected]> Committed: Mon Jul 11 10:58:06 2016 +0800 ---------------------------------------------------------------------- core-common/pom.xml | 4 ---- jdbc/pom.xml | 10 ++++------ 2 files changed, 4 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/9c578e70/core-common/pom.xml ---------------------------------------------------------------------- diff --git a/core-common/pom.xml b/core-common/pom.xml index 5d5369f..ca4c7a9 100644 --- a/core-common/pom.xml +++ b/core-common/pom.xml @@ -65,10 +65,6 @@ <artifactId>commons-email</artifactId> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> - <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/kylin/blob/9c578e70/jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/jdbc/pom.xml b/jdbc/pom.xml index deb3b49..a663fb3 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -93,6 +93,10 @@ <shadedPattern>${shadeBase}.com.fasterxml.jackson</shadedPattern> </relocation> <relocation> + <pattern>org.apache.http</pattern> + <shadedPattern>${shadeBase}.org.apache.http</shadedPattern> + </relocation> + <relocation> <pattern>org.apache.commons</pattern> <shadedPattern>${shadeBase}.org.apache.commons</shadedPattern> </relocation> @@ -106,12 +110,6 @@ <exclude>META-INF/*.RSA</exclude> </excludes> </filter> - <filter> - <artifact>commons-httpclient:commons-httpclient</artifact> - <excludes> - <exclude>META-INF/**</exclude> - </excludes> - </filter> </filters> </configuration> </execution>
