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/08/27 10:21:36 UTC
[kylin] branch master updated: Revert "#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 7b460d1 Revert "#KYLIN-4044, upgrade curator dependency version"
7b460d1 is described below
commit 7b460d10c1e229508eedf87223fc97191bcf904b
Author: nichunen <ni...@apache.org>
AuthorDate: Tue Aug 20 15:13:10 2019 +0800
Revert "#KYLIN-4044, upgrade curator dependency version"
This reverts commit 970899011211b285b78cfc3a63ac5025436ddb59.
---
pom.xml | 35 ++---------------------------------
stream-coordinator/pom.xml | 2 +-
2 files changed, 3 insertions(+), 34 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7d1ded8..34256f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,8 +97,7 @@
<!-- Hadoop Common deps, keep compatible with hadoop2.version -->
<zookeeper.version>3.4.13</zookeeper.version>
- <curator.version>4.2.0</curator.version>
- <curator-test.version>2.12.0</curator-test.version>
+ <curator.version>2.12.0</curator.version>
<jsr305.version>3.0.1</jsr305.version>
<guava.version>14.0</guava.version>
<jsch.version>0.1.54</jsch.version>
@@ -531,34 +530,16 @@
<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>
@@ -1046,23 +1027,11 @@
<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-test.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- </exclusions>
+ <version>${curator.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/stream-coordinator/pom.xml b/stream-coordinator/pom.xml
index f303d2e..9911ec5 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-test.version}</version>
+ <version>${curator.version}</version>
<scope>test</scope>
</dependency>