KYLIN-2428 refine JDBC shade
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/96a41592 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/96a41592 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/96a41592 Branch: refs/heads/KYLIN-2428 Commit: 96a4159274f6896a0cdd7cafd1d093f1416be825 Parents: 07fc6e6 Author: Billy Liu <billy...@apache.org> Authored: Mon Feb 6 23:31:17 2017 +0800 Committer: Billy Liu <billy...@apache.org> Committed: Mon Feb 6 23:31:17 2017 +0800 ---------------------------------------------------------------------- atopcalcite/pom.xml | 1 + jdbc/pom.xml | 14 ++++++++++---- pom.xml | 5 +++++ 3 files changed, 16 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/96a41592/atopcalcite/pom.xml ---------------------------------------------------------------------- diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml index 1b327fe..c65c0d1 100644 --- a/atopcalcite/pom.xml +++ b/atopcalcite/pom.xml @@ -43,6 +43,7 @@ </exclusion> </exclusions> </dependency> + <!-- It should be avatica(the shaded one), not avatica-core, since the inconsistency protobuf dependency with Hadoop --> <dependency> <groupId>org.apache.calcite.avatica</groupId> <artifactId>avatica</artifactId> http://git-wip-us.apache.org/repos/asf/kylin/blob/96a41592/jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 34bdc8a..02890a6 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -43,7 +43,7 @@ </dependency> <dependency> <groupId>org.apache.calcite.avatica</groupId> - <artifactId>avatica</artifactId> + <artifactId>avatica-core</artifactId> </dependency> <dependency> <groupId>junit</groupId> @@ -69,9 +69,7 @@ <artifactSet> <excludes> - <exclude>com.google.protobuf:*</exclude> - <exclude>commons-logging:*</exclude> - <exclude>org.slf4j:jul-to-slf4j</exclude> + <exclude>org.slf4j:jcl-over-slf4j:*</exclude> </excludes> </artifactSet> @@ -85,9 +83,17 @@ <shadedPattern>${shadeBase}.com.fasterxml.jackson</shadedPattern> </relocation> <relocation> + <pattern>com.google.protobuf</pattern> + <shadedPattern>${shadeBase}.com.google.protobuf</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> </relocations> <filters> <filter> http://git-wip-us.apache.org/repos/asf/kylin/blob/96a41592/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3d6c98e..b109783 100644 --- a/pom.xml +++ b/pom.xml @@ -524,6 +524,11 @@ </dependency> <dependency> <groupId>org.apache.calcite.avatica</groupId> + <artifactId>avatica-core</artifactId> + <version>${avatica.version}</version> + </dependency> + <dependency> + <groupId>org.apache.calcite.avatica</groupId> <artifactId>avatica</artifactId> <version>${avatica.version}</version> </dependency>
