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 2017/07/14 08:21:18 UTC
kylin git commit: KYLIN-2699 Tomcat LinkageError for curator-client
jar file conflict
Repository: kylin
Updated Branches:
refs/heads/master 961546334 -> a9c9715d0
KYLIN-2699 Tomcat LinkageError for curator-client jar file conflict
Signed-off-by: Li Yang <li...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/a9c9715d
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/a9c9715d
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/a9c9715d
Branch: refs/heads/master
Commit: a9c9715d08dd5fda47054e74bd4d31f0239ba721
Parents: 9615463
Author: qiumingming <qi...@bytedance.com>
Authored: Fri Jun 30 16:17:56 2017 +0800
Committer: Li Yang <li...@apache.org>
Committed: Fri Jul 14 16:21:00 2017 +0800
----------------------------------------------------------------------
kylin.patch | 0
pom.xml | 6 ++++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/a9c9715d/kylin.patch
----------------------------------------------------------------------
diff --git a/kylin.patch b/kylin.patch
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/kylin/blob/a9c9715d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 506d734..f765f00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -419,6 +419,12 @@
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
+ <artifactId>curator-client</artifactId>
+ <version>${curator.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
<version>${curator.version}</version>
<scope>provided</scope>