[dubbo] branch 3.2 updated: Update zookeeper registry dependencies (#13150)

[albumenj]

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.2 by this push:
     new b2e081e513 Update zookeeper registry dependencies (#13150)
b2e081e513 is described below

commit b2e081e5139b43eac48200ed44b3e3cc1236455a
Author: Albumen Kevin <jhq0...@gmail.com>
AuthorDate: Sun Oct 8 10:07:35 2023 +0800

    Update zookeeper registry dependencies (#13150)
    
    * Update zookeeper registry dependencies
    
    * Fix compile
    
    * Update zookeeper registry dependencies
---
 .../registry/multiple/MultipleRegistry2S2RTest.java    |  6 +++---
 dubbo-registry/dubbo-registry-zookeeper/pom.xml        | 18 +-----------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git 
a/dubbo-registry/dubbo-registry-multiple/src/test/java/org/apache/dubbo/registry/multiple/MultipleRegistry2S2RTest.java
 
b/dubbo-registry/dubbo-registry-multiple/src/test/java/org/apache/dubbo/registry/multiple/MultipleRegistry2S2RTest.java
index 4d16b2d600..a91df2ad42 100644
--- 
a/dubbo-registry/dubbo-registry-multiple/src/test/java/org/apache/dubbo/registry/multiple/MultipleRegistry2S2RTest.java
+++ 
b/dubbo-registry/dubbo-registry-multiple/src/test/java/org/apache/dubbo/registry/multiple/MultipleRegistry2S2RTest.java
@@ -21,7 +21,7 @@ import org.apache.dubbo.registry.NotifyListener;
 import org.apache.dubbo.registry.Registry;
 import org.apache.dubbo.registry.zookeeper.ZookeeperRegistry;
 import org.apache.dubbo.remoting.zookeeper.ZookeeperClient;
-import org.apache.dubbo.remoting.zookeeper.curator.CuratorZookeeperClient;
+import org.apache.dubbo.remoting.zookeeper.curator5.Curator5ZookeeperClient;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Assumptions;
@@ -61,9 +61,9 @@ class MultipleRegistry2S2RTest {
         multipleRegistry = (MultipleRegistry) new 
MultipleRegistryFactory().createRegistry(url);
 
         // for test validation
-        zookeeperClient = new 
CuratorZookeeperClient(URL.valueOf(zookeeperConnectionAddress1));
+        zookeeperClient = new 
Curator5ZookeeperClient(URL.valueOf(zookeeperConnectionAddress1));
         zookeeperRegistry = 
MultipleRegistryTestUtil.getZookeeperRegistry(multipleRegistry.getServiceRegistries().values());
-        zookeeperClient2 = new 
CuratorZookeeperClient(URL.valueOf(zookeeperConnectionAddress2));
+        zookeeperClient2 = new 
Curator5ZookeeperClient(URL.valueOf(zookeeperConnectionAddress2));
         zookeeperRegistry2 = 
MultipleRegistryTestUtil.getZookeeperRegistry(multipleRegistry.getServiceRegistries().values());
     }
 
diff --git a/dubbo-registry/dubbo-registry-zookeeper/pom.xml 
b/dubbo-registry/dubbo-registry-zookeeper/pom.xml
index fd518e13e1..9571e7e3d3 100644
--- a/dubbo-registry/dubbo-registry-zookeeper/pom.xml
+++ b/dubbo-registry/dubbo-registry-zookeeper/pom.xml
@@ -37,7 +37,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>
@@ -45,20 +45,4 @@
             <artifactId>curator-x-discovery</artifactId>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>curator5</id>
-            <activation>
-                <jdk>[17,)</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.dubbo</groupId>
-                    <artifactId>dubbo-remoting-zookeeper-curator5</artifactId>
-                    <version>${project.parent.version}</version>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
 </project>