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 06:58:15 UTC
[3/3] kylin git commit: KYLIN-2394 Upgrade Calcite to 1.11 and
Avatica to 1.9
KYLIN-2394 Upgrade Calcite to 1.11 and Avatica to 1.9
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/a2d8b3cc
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/a2d8b3cc
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/a2d8b3cc
Branch: refs/heads/KYLIN-2394
Commit: a2d8b3ccc11e2ca3a13d1e1a022eff60d17e340c
Parents: 4bc31de
Author: Billy Liu <bi...@apache.org>
Authored: Mon Jan 16 14:58:00 2017 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Mon Jan 16 14:58:00 2017 +0800
----------------------------------------------------------------------
atopcalcite/pom.xml | 52 +
.../calcite/sql2rel/SqlToRelConverter.java | 3941 +++++++++++-------
jdbc/pom.xml | 13 +-
.../java/org/apache/kylin/jdbc/KylinMeta.java | 2 +-
kylin-it/pom.xml | 8 -
.../org/apache/kylin/jdbc/ITJDBCDriverTest.java | 1 +
pom.xml | 12 +-
query/pom.xml | 4 -
8 files changed, 2461 insertions(+), 1572 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/a2d8b3cc/atopcalcite/pom.xml
----------------------------------------------------------------------
diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml
index b916df2..584d313 100644
--- a/atopcalcite/pom.xml
+++ b/atopcalcite/pom.xml
@@ -32,11 +32,63 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
+ <properties>
+ <shadeBase>org.apache.kylin.calcite.shaded</shadeBase>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica-core</artifactId>
+ </dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
+ <artifactSet>
+ <excludes>
+ <exclude>org.slf4j:*</exclude>
+ <exclude>com.google.code.findbugs:*</exclude>
+ <exclude>com.google.guava:*</exclude>
+ </excludes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>com.fasterxml.jackson</pattern>
+ <shadedPattern>${shadeBase}.com.fasterxml.jackson</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.http</pattern>
+ <shadedPattern>${shadeBase}.org.apache.http</shadedPattern>
+ </relocation>
+ <relocation>
+ <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>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>