You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2016/03/11 05:12:34 UTC
kylin git commit: fix Linkage Error due to duplicate loaded protobuf
jar
Repository: kylin
Updated Branches:
refs/heads/master 376d695c5 -> 6836815b9
fix Linkage Error due to duplicate loaded protobuf jar
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/6836815b
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/6836815b
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/6836815b
Branch: refs/heads/master
Commit: 6836815b921c9a7a29dc9e44c34a70f7823b42ca
Parents: 376d695
Author: Hongbin Ma <ma...@apache.org>
Authored: Fri Mar 11 12:12:21 2016 +0800
Committer: Hongbin Ma <ma...@apache.org>
Committed: Fri Mar 11 12:12:26 2016 +0800
----------------------------------------------------------------------
atopcalcite/pom.xml | 6 ++++++
jdbc/pom.xml | 6 ++++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/6836815b/atopcalcite/pom.xml
----------------------------------------------------------------------
diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml
index ba5ab1a..93f52b7 100644
--- a/atopcalcite/pom.xml
+++ b/atopcalcite/pom.xml
@@ -41,6 +41,12 @@
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-avatica</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/kylin/blob/6836815b/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index dae9d1e..805f34f 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -44,6 +44,12 @@
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-avatica</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>