You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@dubbo.apache.org by li...@apache.org on 2018/12/24 07:10:24 UTC
[incubator-dubbo-samples] 01/03: make sure different curator and
zookeeper versions work together
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch samples-for-2.7.0-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-samples.git
commit ee887068f86c003d38f2bbd4f5a3d2b1ea1faae1
Author: ken.lj <ke...@gmail.com>
AuthorDate: Thu Nov 29 17:31:26 2018 +0800
make sure different curator and zookeeper versions work together
---
dubbo-samples-docker/pom.xml | 2 --
pom.xml | 30 ++++++++++++++++++++++++++++--
2 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/dubbo-samples-docker/pom.xml b/dubbo-samples-docker/pom.xml
index c81d611..487732a 100644
--- a/dubbo-samples-docker/pom.xml
+++ b/dubbo-samples-docker/pom.xml
@@ -50,12 +50,10 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.9</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
- <version>2.12.0</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
diff --git a/pom.xml b/pom.xml
index ca96447..9ee8207 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,11 +64,12 @@
<spring.version>4.3.16.RELEASE</spring.version>
<dubbo.version>2.7.0-SNAPSHOT</dubbo.version>
<dubbo.rpc.version>2.7.0-SNAPSHOT</dubbo.rpc.version>
- <curator.version>2.12.0</curator.version>
+ <zookeeper.version>3.4.13</zookeeper.version>
+ <curator.version>4.0.1</curator.version>
<validation-api.version>1.1.0.Final</validation-api.version>
<hibernate-validator.version>4.2.0.Final</hibernate-validator.version>
<resteasy.version>3.0.19.Final</resteasy.version>
- <curator-client.version>2.12.0</curator-client.version>
+ <curator-client.version>4.0.1</curator-client.version>
<swagger.version>1.5.19</swagger.version>
<tomcat.version>7.0.88</tomcat.version>
<servlet.version>3.0.1</servlet.version>
@@ -104,9 +105,20 @@
<version>${dubbo.rpc.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
+ </dependency>
+ <dependency>
<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>javax.validation</groupId>
@@ -127,6 +139,12 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
<version>${curator-client.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -166,9 +184,17 @@
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
</dependency>