You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by bi...@apache.org on 2017/01/16 03:32:12 UTC
kylin git commit: update shade
Repository: kylin
Updated Branches:
refs/heads/calcite-11 1eeef89ca -> 14419364c
update shade
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/14419364
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/14419364
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/14419364
Branch: refs/heads/calcite-11
Commit: 14419364c0dc456a213ebecd98b9c52704ffefc0
Parents: 1eeef89
Author: Billy Liu <bi...@apache.org>
Authored: Mon Jan 16 11:32:00 2017 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Mon Jan 16 11:32:00 2017 +0800
----------------------------------------------------------------------
atopcalcite/pom.xml | 27 +++++++++++----------------
jdbc/pom.xml | 1 +
query/pom.xml | 4 ----
3 files changed, 12 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/14419364/atopcalcite/pom.xml
----------------------------------------------------------------------
diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml
index cdbe03c..37d0e6e 100644
--- a/atopcalcite/pom.xml
+++ b/atopcalcite/pom.xml
@@ -58,21 +58,20 @@
<goal>shade</goal>
</goals>
<configuration>
+ <minimizeJar>true</minimizeJar>
<createDependencyReducedPom>false</createDependencyReducedPom>
+ <artifactSet>
+ <excludes>
+ <exclude>org.slf4j:*</exclude>
+ <exclude>org.pentaho:*</exclude>
+ <exclude>org.codehaus:*</exclude>
+ <exclude>javax.annotation:*</exclude>
+ <exclude>com.google.common:*</exclude>
+ <exclude>org.apache.commons:*</exclude>
+ </excludes>
+ </artifactSet>
<relocations>
<relocation>
- <pattern>org.apache.calcite</pattern>
- <shadedPattern>${shadeBase}.org.apache.calcite</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.google.common</pattern>
- <shadedPattern>${shadeBase}.com.google.common</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.annotation</pattern>
- <shadedPattern>${shadeBase}.javax.annotation</shadedPattern>
- </relocation>
- <relocation>
<pattern>com.fasterxml.jackson</pattern>
<shadedPattern>${shadeBase}.com.fasterxml.jackson</shadedPattern>
</relocation>
@@ -81,10 +80,6 @@
<shadedPattern>${shadeBase}.org.apache.http</shadedPattern>
</relocation>
<relocation>
- <pattern>org.apache.commons</pattern>
- <shadedPattern>${shadeBase}.org.apache.commons</shadedPattern>
- </relocation>
- <relocation>
<pattern>com.google.protobuf</pattern>
<shadedPattern>${shadeBase}.com.google.protobuf</shadedPattern>
</relocation>
http://git-wip-us.apache.org/repos/asf/kylin/blob/14419364/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 993822f..27faf61 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -67,6 +67,7 @@
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
+ <minimizeJar>true</minimizeJar>
<relocations>
<relocation>
<pattern>org.apache.calcite</pattern>
http://git-wip-us.apache.org/repos/asf/kylin/blob/14419364/query/pom.xml
----------------------------------------------------------------------
diff --git a/query/pom.xml b/query/pom.xml
index b7cbf6d..f581b70 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -41,10 +41,6 @@
<artifactId>kylin-core-storage</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.calcite</groupId>
- <artifactId>calcite-core</artifactId>
- </dependency>
- <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>