feat:update all old zookeeper version -> curator5 (#1124)

apache · Apr 7, 2024 · 9c40d18 · 9c40d18
1 parent bacc302
commit 9c40d18
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/...ples-migration-case-application/dubbo-samples-migration-case-application-consumer/pom.xml b/...ples-migration-case-application/dubbo-samples-migration-case-application-consumer/pom.xml
@@ -30,7 +30,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <dubbo.consumer.version>2.7.13</dubbo.consumer.version>
+        <dubbo.consumer.version>3.2.6</dubbo.consumer.version>
         <log4j2.version>2.20.0</log4j2.version>
         <junit.version>4.13.1</junit.version>
 
@@ -55,7 +55,7 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.dubbo</groupId>
-                <artifactId>dubbo-dependencies-zookeeper</artifactId>
+                <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
                 <version>${dubbo.consumer.version}</version>
                 <type>pom</type>
                 <exclusions>
@@ -100,7 +100,7 @@
 
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-dependencies-zookeeper</artifactId>
+            <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
             <type>pom</type>
         </dependency>
 

diff --git a/...s-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleRegistry.java b/...s-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleRegistry.java
@@ -18,7 +18,7 @@
 
 import org.apache.dubbo.registry.zookeeper.ZookeeperRegistryFactory;
 import org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter;
-import org.apache.dubbo.remoting.zookeeper.curator.CuratorZookeeperTransporter;
+import org.apache.dubbo.remoting.zookeeper.curator5.Curator5ZookeeperTransporter;
 
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.registry.NotifyListener;
@@ -34,7 +34,7 @@ public class CompatibleRegistry implements Registry {
 
     public CompatibleRegistry(URL url) {
         this.url = url;
-        ZookeeperTransporter transporter = new CuratorZookeeperTransporter();
+        ZookeeperTransporter transporter = new Curator5ZookeeperTransporter();
         ZookeeperRegistryFactory registryFactory = new ZookeeperRegistryFactory();
         registryFactory.setZookeeperTransporter(transporter);
         delegate = registryFactory.createRegistry(url.setProtocol("zookeeper"));

diff --git a/4-governance/dubbo-samples-zipkin/pom.xml b/4-governance/dubbo-samples-zipkin/pom.xml
@@ -32,7 +32,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <dubbo.version>2.7.13</dubbo.version>
+        <dubbo.version>3.2.6</dubbo.version>
         <spring.version>4.3.30.RELEASE</spring.version>
         <log4j2.version>2.20.0</log4j2.version>
         <junit.version>4.13.1</junit.version>
@@ -70,7 +70,7 @@
 
             <dependency>
                 <groupId>org.apache.dubbo</groupId>
-                <artifactId>dubbo-dependencies-zookeeper</artifactId>
+                <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
                 <version>${dubbo.version}</version>
                 <type>pom</type>
                 <exclusions>
@@ -131,7 +131,7 @@
 
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-dependencies-zookeeper</artifactId>
+            <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
             <type>pom</type>
         </dependency>