This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0 by this push:
new 501b062 Distinguish zookeeper module from zookeeper-curator5 (#9528)
501b062 is described below
commit 501b0625c9296354e14e79f421c12848e38e6863
Author: ken.lj <[email protected]>
AuthorDate: Thu Jan 6 09:56:56 2022 +0800
Distinguish zookeeper module from zookeeper-curator5 (#9528)
Use lower version zookeeper and curator dependencies by default.
---
.../pom.xml | 2 +-
.../dubbo-dependencies-zookeeper/pom.xml | 61 +---------------------
dubbo-dependencies/pom.xml | 1 +
dubbo-distribution/dubbo-bom/pom.xml | 10 ++++
4 files changed, 14 insertions(+), 60 deletions(-)
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
similarity index 98%
copy from dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
copy to dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
index eea6d0e..dc9e4d1 100644
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
@@ -27,7 +27,7 @@
</parent>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-dependencies-zookeeper</artifactId>
+ <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
<version>${revision}</version>
<packaging>pom</packaging>
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
index eea6d0e..a9f29be 100644
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
@@ -34,7 +34,6 @@
<properties>
<revision>3.0.6-SNAPSHOT</revision>
<maven_flatten_version>1.1.0</maven_flatten_version>
- <zookeeper_version>3.7.0</zookeeper_version>
</properties>
<dependencyManagement>
@@ -46,13 +45,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>parent</artifactId>
- <version>${zookeeper_version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -60,61 +52,12 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-x-discovery</artifactId>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-annotations</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-client</artifactId>
- </dependency>
-
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- </dependency>
-
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
+ <version>3.4.13</version>
</dependency>
</dependencies>
diff --git a/dubbo-dependencies/pom.xml b/dubbo-dependencies/pom.xml
index 5d0ca46..628d9b1 100644
--- a/dubbo-dependencies/pom.xml
+++ b/dubbo-dependencies/pom.xml
@@ -28,6 +28,7 @@
<packaging>pom</packaging>
<modules>
<module>dubbo-dependencies-zookeeper</module>
+ <module>dubbo-dependencies-zookeeper-curator5</module>
</modules>
diff --git a/dubbo-distribution/dubbo-bom/pom.xml
b/dubbo-distribution/dubbo-bom/pom.xml
index 1065927..fc7e102 100644
--- a/dubbo-distribution/dubbo-bom/pom.xml
+++ b/dubbo-distribution/dubbo-bom/pom.xml
@@ -286,6 +286,16 @@
<artifactId>dubbo-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-dependencies-zookeeper</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
