You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ni...@apache.org on 2019/06/20 01:49:49 UTC
[kylin] branch master updated: #KYLIN-4044,
upgrade curator dependency version
This is an automated email from the ASF dual-hosted git repository.
nic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push:
new 9708990 #KYLIN-4044, upgrade curator dependency version
9708990 is described below
commit 970899011211b285b78cfc3a63ac5025436ddb59
Author: ZhengshuaiPENG <co...@hotmail.com>
AuthorDate: Fri Jun 14 11:42:28 2019 +0800
#KYLIN-4044, upgrade curator dependency version
---
pom.xml | 35 +++++++++++++++++++++++++++++++++--
stream-coordinator/pom.xml | 2 +-
2 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 417a8c5..9ce0f8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,8 @@
<!-- Hadoop Common deps, keep compatible with hadoop2.version -->
<zookeeper.version>3.4.13</zookeeper.version>
- <curator.version>2.12.0</curator.version>
+ <curator.version>4.2.0</curator.version>
+ <curator-test.version>2.12.0</curator-test.version>
<jsr305.version>3.0.1</jsr305.version>
<guava.version>14.0</guava.version>
<jsch.version>0.1.54</jsch.version>
@@ -530,16 +531,34 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
<version>${curator.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
<version>${curator.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
<version>${curator.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
@@ -1027,11 +1046,23 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-x-discovery</artifactId>
<version>${curator.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
- <version>${curator.version}</version>
+ <version>${curator-test.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ </exclusions>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/stream-coordinator/pom.xml b/stream-coordinator/pom.xml
index 9911ec5..f303d2e 100644
--- a/stream-coordinator/pom.xml
+++ b/stream-coordinator/pom.xml
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
- <version>${curator.version}</version>
+ <version>${curator-test.version}</version>
<scope>test</scope>
</dependency>