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/02/06 10:40:24 UTC
[2/2] kylin git commit: update kyro-shaded as provided
update kyro-shaded as provided
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/b88e5586
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/b88e5586
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/b88e5586
Branch: refs/heads/dep-clean
Commit: b88e5586b34117d45d42ba46d61b8bdee4760e3e
Parents: 94b60d2
Author: Billy Liu <bi...@apache.org>
Authored: Mon Feb 6 18:40:13 2017 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Mon Feb 6 18:40:13 2017 +0800
----------------------------------------------------------------------
core-cube/pom.xml | 8 ++++----
pom.xml | 5 +++++
server/pom.xml | 4 ++++
3 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/b88e5586/core-cube/pom.xml
----------------------------------------------------------------------
diff --git a/core-cube/pom.xml b/core-cube/pom.xml
index 5bcc112..fe80783 100644
--- a/core-cube/pom.xml
+++ b/core-cube/pom.xml
@@ -48,10 +48,6 @@
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
- <dependency>
- <groupId>com.esotericsoftware</groupId>
- <artifactId>kryo-shaded</artifactId>
- </dependency>
<!-- Provided -->
<dependency>
@@ -70,6 +66,10 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.esotericsoftware</groupId>
+ <artifactId>kryo-shaded</artifactId>
+ </dependency>
<!-- Env & Test -->
<dependency>
http://git-wip-us.apache.org/repos/asf/kylin/blob/b88e5586/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6d8e552..c717fea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -550,26 +550,31 @@
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.10</artifactId>
<version>${spark.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_2.10</artifactId>
<version>${spark.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-hive_2.10</artifactId>
<version>${spark.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.esotericsoftware</groupId>
<artifactId>kryo-shaded</artifactId>
<version>${kryo.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>${reflections.version}</version>
+ <scope>provided</scope>
</dependency>
<!-- Kafka dependency -->
<dependency>
http://git-wip-us.apache.org/repos/asf/kylin/blob/b88e5586/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 454ed6b..3c96e60 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -233,6 +233,10 @@
<artifactId>jetty-all</artifactId>
<groupId>org.eclipse.jetty.aggregate</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>calcite-core</artifactId>
+ <groupId>org.apache.calcite</groupId>
+ </exclusion>
</exclusions>
</dependency>