feat:remove old zookeeper (apache#13960)

Stellar1999 · Apr 4, 2024 · 729e83c · 729e83c
1 parent a12975a
commit 729e83c
Show file tree

Hide file tree

Showing 20 changed files with 3 additions and 1,816 deletions.
diff --git a/.artifacts b/.artifacts
@@ -38,7 +38,6 @@ dubbo-core-spi
 dubbo-dependencies
 dubbo-dependencies-all
 dubbo-dependencies-bom
-dubbo-dependencies-zookeeper
 dubbo-dependencies-zookeeper-curator5
 dubbo-distribution
 dubbo-filter-cache
@@ -81,7 +80,6 @@ dubbo-remoting-http12
 dubbo-remoting-netty
 dubbo-remoting-netty4
 dubbo-remoting-zookeeper-api
-dubbo-remoting-zookeeper
 dubbo-remoting-zookeeper-curator5
 dubbo-rpc
 dubbo-rpc-api

diff --git a/dubbo-compatible/pom.xml b/dubbo-compatible/pom.xml
@@ -45,7 +45,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-remoting-zookeeper</artifactId>
+      <artifactId>dubbo-remoting-zookeeper-curator5</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
     <dependency>

diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
diff --git a/dubbo-dependencies/pom.xml b/dubbo-dependencies/pom.xml
@@ -27,7 +27,6 @@
   <artifactId>dubbo-dependencies</artifactId>
   <packaging>pom</packaging>
   <modules>
-    <module>dubbo-dependencies-zookeeper</module>
     <module>dubbo-dependencies-zookeeper-curator5</module>
   </modules>
 

diff --git a/dubbo-distribution/dubbo-all-shaded/pom.xml b/dubbo-distribution/dubbo-all-shaded/pom.xml
@@ -328,7 +328,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-remoting-zookeeper</artifactId>
+      <artifactId>dubbo-remoting-zookeeper-curator5</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
       <optional>true</optional>
@@ -502,7 +502,6 @@
                   <include>org.apache.dubbo:dubbo-remoting-http</include>
                   <include>org.apache.dubbo:dubbo-remoting-netty4</include>
                   <include>org.apache.dubbo:dubbo-remoting-netty</include>
-                  <include>org.apache.dubbo:dubbo-remoting-zookeeper</include>
                   <include>org.apache.dubbo:dubbo-remoting-zookeeper-curator5</include>
                   <include>org.apache.dubbo:dubbo-rpc-api</include>
                   <include>org.apache.dubbo:dubbo-rpc-dubbo</include>

diff --git a/dubbo-distribution/dubbo-all/pom.xml b/dubbo-distribution/dubbo-all/pom.xml
@@ -378,13 +378,6 @@
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-remoting-zookeeper</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.apache.dubbo</groupId>
       <artifactId>dubbo-remoting-zookeeper-curator5</artifactId>
@@ -558,7 +551,6 @@
                   <include>org.apache.dubbo:dubbo-remoting-netty4</include>
                   <include>org.apache.dubbo:dubbo-remoting-netty</include>
                   <include>org.apache.dubbo:dubbo-remoting-zookeeper-api</include>
-                  <include>org.apache.dubbo:dubbo-remoting-zookeeper</include>
                   <include>org.apache.dubbo:dubbo-remoting-zookeeper-curator5</include>
                   <include>org.apache.dubbo:dubbo-rpc-api</include>
                   <include>org.apache.dubbo:dubbo-rpc-dubbo</include>

diff --git a/dubbo-distribution/dubbo-bom/pom.xml b/dubbo-distribution/dubbo-bom/pom.xml
@@ -415,11 +415,6 @@
         <artifactId>dubbo-remoting-zookeeper-api</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.dubbo</groupId>
-        <artifactId>dubbo-remoting-zookeeper</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.dubbo</groupId>
         <artifactId>dubbo-remoting-zookeeper-curator5</artifactId>

diff --git a/...zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/ZookeeperTransporter.java b/...zookeeper-api/src/main/java/org/apache/dubbo/remoting/zookeeper/ZookeeperTransporter.java
@@ -27,16 +27,14 @@ public interface ZookeeperTransporter {
 
     String CURATOR_5 = "curator5";
 
-    String CURATOR = "curator";
-
     ZookeeperClient connect(URL url);
 
     void destroy();
 
     static ZookeeperTransporter getExtension(ApplicationModel applicationModel) {
         ExtensionLoader<ZookeeperTransporter> extensionLoader =
                 applicationModel.getExtensionLoader(ZookeeperTransporter.class);
-        return isHighVersionCurator() ? extensionLoader.getExtension(CURATOR_5) : extensionLoader.getExtension(CURATOR);
+        return extensionLoader.getExtension(CURATOR_5);
     }
 
     static boolean isHighVersionCurator() {

diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml b/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml