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/658839d6 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/658839d6 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/658839d6 Branch: refs/heads/v1.5.3-release-rc2 Commit: 658839d63ccccfd60518a0a4659e7ab96feae22b Parents: edd528d Author: gaodayue <gaoda...@meituan.com> Authored: Mon Jul 11 10:58:06 2016 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Fri Jul 22 12:38:04 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/658839d6/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/658839d6/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>
