Repository: kylin Updated Branches: refs/heads/KYLIN-2394 a2d8b3ccc -> c9f09dd44
fix dep Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c9f09dd4 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/c9f09dd4 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/c9f09dd4 Branch: refs/heads/KYLIN-2394 Commit: c9f09dd446f641f7c6493571b0b6c9a081ab0251 Parents: a2d8b3c Author: Billy Liu <billy...@apache.org> Authored: Mon Jan 16 17:13:49 2017 +0800 Committer: Billy Liu <billy...@apache.org> Committed: Mon Jan 16 17:13:49 2017 +0800 ---------------------------------------------------------------------- atopcalcite/pom.xml | 12 ++++-------- server-base/pom.xml | 5 +++++ 2 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/c9f09dd4/atopcalcite/pom.xml ---------------------------------------------------------------------- diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml index 584d313..74ebf7f 100644 --- a/atopcalcite/pom.xml +++ b/atopcalcite/pom.xml @@ -41,10 +41,6 @@ <groupId>org.apache.calcite</groupId> <artifactId>calcite-core</artifactId> </dependency> - <dependency> - <groupId>org.apache.calcite.avatica</groupId> - <artifactId>avatica-core</artifactId> - </dependency> </dependencies> <build> @@ -69,6 +65,10 @@ </artifactSet> <relocations> <relocation> + <pattern>org.apache.calcite</pattern> + <shadedPattern>${shadeBase}.org.apache.calcite</shadedPattern> + </relocation> + <relocation> <pattern>com.fasterxml.jackson</pattern> <shadedPattern>${shadeBase}.com.fasterxml.jackson</shadedPattern> </relocation> @@ -80,10 +80,6 @@ <pattern>com.google.protobuf</pattern> <shadedPattern>${shadeBase}.com.google.protobuf</shadedPattern> </relocation> - <relocation> - <pattern>org.apache.commons</pattern> - <shadedPattern>${shadeBase}.org.apache.commons</shadedPattern> - </relocation> </relocations> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/kylin/blob/c9f09dd4/server-base/pom.xml ---------------------------------------------------------------------- diff --git a/server-base/pom.xml b/server-base/pom.xml index 627ae35..f6e5a24 100644 --- a/server-base/pom.xml +++ b/server-base/pom.xml @@ -48,6 +48,11 @@ </exclusions> </dependency> <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>3.1.0</version> + </dependency> + <dependency> <groupId>org.apache.kylin</groupId> <artifactId>kylin-storage-hbase</artifactId> </dependency>
