You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2016/08/04 15:37:33 UTC
kylin git commit: KYLIN-1939 Fix linkage error by protobuf
Repository: kylin
Updated Branches:
refs/heads/master 0c67dfbca -> e885b750a
KYLIN-1939 Fix linkage error by protobuf
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/e885b750
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/e885b750
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/e885b750
Branch: refs/heads/master
Commit: e885b750a2375d22d0831dcd4f861e91eb7d3e3b
Parents: 0c67dfb
Author: lidongsjtu <li...@apache.org>
Authored: Thu Aug 4 23:36:52 2016 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Thu Aug 4 23:36:52 2016 +0800
----------------------------------------------------------------------
pom.xml | 6 ++++++
server/pom.xml | 8 --------
2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/e885b750/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 02eecfe..fe0d8cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -438,6 +438,12 @@
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
<version>${calcite.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.calcite</groupId>
http://git-wip-us.apache.org/repos/asf/kylin/blob/e885b750/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 1205bb7..9068c6e 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -30,7 +30,6 @@
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
<version>1.5.4-SNAPSHOT</version>
-
</parent>
<dependencies>
@@ -121,13 +120,6 @@
<scope>test</scope>
</dependency>
- <!-- depends on kylin-jdbc just for running jdbc test cases in server module -->
- <dependency>
- <groupId>org.apache.kylin</groupId>
- <artifactId>kylin-jdbc</artifactId>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-resourcemanager</artifactId>