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 02:28:52 UTC
[1/2] kylin git commit: add jdbc dep back to kylin-it
Repository: kylin
Updated Branches:
refs/heads/calcite-11 beff97dbc -> 1eeef89ca
add jdbc dep back to kylin-it
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/d450733a
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/d450733a
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/d450733a
Branch: refs/heads/calcite-11
Commit: d450733a773f92522a02b39248d3e114c4a8de2c
Parents: beff97d
Author: Billy Liu <bi...@apache.org>
Authored: Sun Jan 15 13:58:30 2017 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Sun Jan 15 13:58:30 2017 +0800
----------------------------------------------------------------------
kylin-it/pom.xml | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/d450733a/kylin-it/pom.xml
----------------------------------------------------------------------
diff --git a/kylin-it/pom.xml b/kylin-it/pom.xml
index c5242b4..a3020ae 100644
--- a/kylin-it/pom.xml
+++ b/kylin-it/pom.xml
@@ -57,6 +57,10 @@
</dependency>
<dependency>
<groupId>org.apache.kylin</groupId>
+ <artifactId>kylin-jdbc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kylin</groupId>
<artifactId>kylin-tool</artifactId>
</dependency>
<dependency>
@@ -108,6 +112,7 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog-core</artifactId>
@@ -239,12 +244,6 @@
<profiles>
<profile>
<id>sandbox-query</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.kylin</groupId>
- <artifactId>kylin-jdbc</artifactId>
- </dependency>
- </dependencies>
<build>
<plugins>
<plugin>
[2/2] kylin git commit: shade atopcalcite
Posted by bi...@apache.org.
shade atopcalcite
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/1eeef89c
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/1eeef89c
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/1eeef89c
Branch: refs/heads/calcite-11
Commit: 1eeef89ca02645bd56e8ab07f8fad55941a390e8
Parents: d450733
Author: Billy Liu <bi...@apache.org>
Authored: Mon Jan 16 10:28:46 2017 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Mon Jan 16 10:28:46 2017 +0800
----------------------------------------------------------------------
atopcalcite/pom.xml | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/1eeef89c/atopcalcite/pom.xml
----------------------------------------------------------------------
diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml
index b15adfa..cdbe03c 100644
--- a/atopcalcite/pom.xml
+++ b/atopcalcite/pom.xml
@@ -40,6 +40,10 @@
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica-core</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -57,6 +61,30 @@
<createDependencyReducedPom>false</createDependencyReducedPom>
<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>
+ <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>
+ <relocation>
<pattern>com.google.protobuf</pattern>
<shadedPattern>${shadeBase}.com.google.protobuf</shadedPattern>
</relocation>