From 6df464bc10d79bbc8fce637a6ff714772d565f21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=B4=E8=8A=82?= <hzj266771@antgroup.com>
Date: Thu, 23 Mar 2023 15:55:17 +0800
Subject: [PATCH 01/10] rename thread pool monitor config

---
 .../alipay/sofa/boot/logging/LogEnvironmentPostProcessor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sofa-boot-project/sofa-boot/src/main/java/com/alipay/sofa/boot/logging/LogEnvironmentPostProcessor.java b/sofa-boot-project/sofa-boot/src/main/java/com/alipay/sofa/boot/logging/LogEnvironmentPostProcessor.java
index 24044b740..fa255cfdd 100644
--- a/sofa-boot-project/sofa-boot/src/main/java/com/alipay/sofa/boot/logging/LogEnvironmentPostProcessor.java
+++ b/sofa-boot-project/sofa-boot/src/main/java/com/alipay/sofa/boot/logging/LogEnvironmentPostProcessor.java
@@ -47,7 +47,7 @@ public class LogEnvironmentPostProcessor implements EnvironmentPostProcessor, Or
     /**
      * support use config to disable sofa common thread pool monitor.
      */
-    public static final String SOFA_THREAD_POOL_MONITOR_DISABLE = "sofa.boot.threadPoolMonitor.disable";
+    public static final String SOFA_THREAD_POOL_MONITOR_DISABLE = "sofa.boot.tools.thread-pool-monitor";
 
     @Override
     public void postProcessEnvironment(ConfigurableEnvironment environment,

From a4a8d4ed570da638f29b815b2aa28a233a5310e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=B4=E8=8A=82?= <hzj266771@antgroup.com>
Date: Thu, 23 Mar 2023 15:58:01 +0800
Subject: [PATCH 02/10] rename thread pool monitor config

---
 .../alipay/sofa/boot/logging/LogEnvironmentPostProcessor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sofa-boot-project/sofa-boot/src/main/java/com/alipay/sofa/boot/logging/LogEnvironmentPostProcessor.java b/sofa-boot-project/sofa-boot/src/main/java/com/alipay/sofa/boot/logging/LogEnvironmentPostProcessor.java
index fa255cfdd..d0894246a 100644
--- a/sofa-boot-project/sofa-boot/src/main/java/com/alipay/sofa/boot/logging/LogEnvironmentPostProcessor.java
+++ b/sofa-boot-project/sofa-boot/src/main/java/com/alipay/sofa/boot/logging/LogEnvironmentPostProcessor.java
@@ -47,7 +47,7 @@ public class LogEnvironmentPostProcessor implements EnvironmentPostProcessor, Or
     /**
      * support use config to disable sofa common thread pool monitor.
      */
-    public static final String SOFA_THREAD_POOL_MONITOR_DISABLE = "sofa.boot.tools.thread-pool-monitor";
+    public static final String SOFA_THREAD_POOL_MONITOR_DISABLE = "sofa.boot.tools.thread-pool-monitor-disable";
 
     @Override
     public void postProcessEnvironment(ConfigurableEnvironment environment,

From a2a5d80b800acffcf8d53844497e4da8cc8c379a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=B4=E8=8A=82?= <hzj266771@antgroup.com>
Date: Thu, 23 Mar 2023 16:00:01 +0800
Subject: [PATCH 03/10] rename thread pool monitor config

---
 .../alipay/sofa/boot/logging/LogEnvironmentPostProcessor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sofa-boot-project/sofa-boot/src/main/java/com/alipay/sofa/boot/logging/LogEnvironmentPostProcessor.java b/sofa-boot-project/sofa-boot/src/main/java/com/alipay/sofa/boot/logging/LogEnvironmentPostProcessor.java
index d0894246a..c0534cc50 100644
--- a/sofa-boot-project/sofa-boot/src/main/java/com/alipay/sofa/boot/logging/LogEnvironmentPostProcessor.java
+++ b/sofa-boot-project/sofa-boot/src/main/java/com/alipay/sofa/boot/logging/LogEnvironmentPostProcessor.java
@@ -47,7 +47,7 @@ public class LogEnvironmentPostProcessor implements EnvironmentPostProcessor, Or
     /**
      * support use config to disable sofa common thread pool monitor.
      */
-    public static final String SOFA_THREAD_POOL_MONITOR_DISABLE = "sofa.boot.tools.thread-pool-monitor-disable";
+    public static final String SOFA_THREAD_POOL_MONITOR_DISABLE = "sofa.boot.tools.threadpool.monitor.disable";
 
     @Override
     public void postProcessEnvironment(ConfigurableEnvironment environment,

From 91689379aa2e5e128b87a9214f0a971f88e81aee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=B4=E8=8A=82?= <hzj266771@antgroup.com>
Date: Mon, 27 Mar 2023 11:43:31 +0800
Subject: [PATCH 04/10] update dubbo 3.1.8 update maven-surefire-plugin 3.0.0

---
 sofa-boot-project/sofaboot-dependencies/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sofa-boot-project/sofaboot-dependencies/pom.xml b/sofa-boot-project/sofaboot-dependencies/pom.xml
index 3839b31b9..10742cdb1 100644
--- a/sofa-boot-project/sofaboot-dependencies/pom.xml
+++ b/sofa-boot-project/sofaboot-dependencies/pom.xml
@@ -20,6 +20,7 @@
         <maven-pmd-plgun.version>3.19.0</maven-pmd-plgun.version>
         <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
         <maven-jacoco-plugin.version>0.8.7</maven-jacoco-plugin.version>
+        <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
         <!-- sofa stack lib-->
         <sofa.registry.version>6.1.8</sofa.registry.version>
         <tracer.core.version>4.0.0-SNAPSHOT</tracer.core.version>
@@ -47,7 +48,7 @@
         <common.dbcp.version>1.4</common.dbcp.version>
         <resteasy.version>3.6.3.Final</resteasy.version>
         <curator.version>4.0.1</curator.version>
-        <dubbo.version>2.6.9</dubbo.version>
+        <dubbo.version>3.1.8</dubbo.version>
         <zkclient.version>0.11</zkclient.version>
         <nacos.version>1.0.0</nacos.version>
         <swagger.version>1.6.7</swagger.version>

From 88b7711075ad28b28d2f29398502fc090a1800a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=B4=E8=8A=82?= <hzj266771@antgroup.com>
Date: Mon, 27 Mar 2023 12:04:03 +0800
Subject: [PATCH 05/10] update dubbo 3.1.8 update curator 5.4.0

---
 .../sofa-boot-core/rpc-sofa-boot/pom.xml      |  2 +-
 .../sofaboot-dependencies/pom.xml             |  4 +--
 .../src/main/resources/spring/test_all.xml    | 19 +++++---------
 .../rpc/boot/SofaBootRpcApplicationTests.java | 26 +++++++++----------
 4 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/pom.xml b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/pom.xml
index 705bd414b..3b33e335d 100644
--- a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/pom.xml
+++ b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/pom.xml
@@ -71,7 +71,7 @@
 
         <!--dubbo-->
         <dependency>
-            <groupId>com.alibaba</groupId>
+            <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo</artifactId>
             <exclusions>
                 <exclusion>
diff --git a/sofa-boot-project/sofaboot-dependencies/pom.xml b/sofa-boot-project/sofaboot-dependencies/pom.xml
index 10742cdb1..91508d923 100644
--- a/sofa-boot-project/sofaboot-dependencies/pom.xml
+++ b/sofa-boot-project/sofaboot-dependencies/pom.xml
@@ -47,7 +47,7 @@
         <c3p0.version>0.9.1.1</c3p0.version>
         <common.dbcp.version>1.4</common.dbcp.version>
         <resteasy.version>3.6.3.Final</resteasy.version>
-        <curator.version>4.0.1</curator.version>
+        <curator.version>5.4.0</curator.version>
         <dubbo.version>3.1.8</dubbo.version>
         <zkclient.version>0.11</zkclient.version>
         <nacos.version>1.0.0</nacos.version>
@@ -685,7 +685,7 @@
 
             <!--dubbo-->
             <dependency>
-                <groupId>com.alibaba</groupId>
+                <groupId>org.apache.dubbo</groupId>
                 <artifactId>dubbo</artifactId>
                 <version>${dubbo.version}</version>
                 <exclusions>
diff --git a/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/main/resources/spring/test_all.xml b/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/main/resources/spring/test_all.xml
index d1aeba605..0c0579cb8 100644
--- a/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/main/resources/spring/test_all.xml
+++ b/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/main/resources/spring/test_all.xml
@@ -2,10 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:sofa="http://sofastack.io/schema/sofaboot"
-       xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-            http://sofastack.io/schema/sofaboot http://sofastack.io/schema/sofaboot.xsd
-            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+            http://sofastack.io/schema/sofaboot http://sofastack.io/schema/sofaboot.xsd">
 
     <!-- invoke sync-->
     <bean id="helloSyncServiceImpl" class="com.alipay.sofa.smoke.tests.rpc.boot.bean.invoke.HelloSyncServiceImpl"/>
@@ -117,7 +115,7 @@
     </sofa:reference>
 
     <!-- dubbo -->
-    <!--<bean id="dubboServiceImpl" class="com.alipay.sofa.tests.rpc.bean.dubbo.DubboServiceImpl"/>
+    <bean id="dubboServiceImpl" class="com.alipay.sofa.smoke.tests.rpc.boot.bean.dubbo.DubboServiceImpl"/>
     <sofa:service ref="dubboServiceImpl" interface="com.alipay.sofa.tests.rpc.bean.dubbo.DubboService">
         <sofa:binding.dubbo/>
     </sofa:service>
@@ -135,18 +133,18 @@
             <sofa:global-attrs retries="2"/>
         </sofa:binding.bolt>
     </sofa:reference>
-   <!-- <sofa:reference jvm-first="false" id="retriesServiceDubbo"
+    <sofa:reference jvm-first="false" id="retriesServiceDubbo"
                     interface="com.alipay.sofa.rpc.test.bean.bean.retry.RetriesService">
         <sofa:binding.dubbo>
             <sofa:global-attrs retries="2"/>
         </sofa:binding.dubbo>
-    </sofa:reference>-->
+    </sofa:reference>
 
     <!-- lazy -->
     <bean id="lazyServiceImpl" class="com.alipay.sofa.smoke.tests.rpc.boot.bean.lazy.LazyServiceImpl"/>
     <sofa:service ref="lazyServiceImpl" interface="com.alipay.sofa.smoke.tests.rpc.boot.bean.lazy.LazyService">
         <sofa:binding.bolt/>
-       <!-- <sofa:binding.dubbo/>-->
+        <sofa:binding.dubbo/>
     </sofa:service>
 
     <sofa:reference jvm-first="false" id="lazyServiceBolt" interface="com.alipay.sofa.smoke.tests.rpc.boot.bean.lazy.LazyService">
@@ -155,11 +153,11 @@
         </sofa:binding.bolt>
     </sofa:reference>
 
-   <!-- <sofa:reference jvm-first="false" id="lazyServiceDubbo" interface="com.alipay.sofa.rpc.test.bean.bean.lazy.LazyService">
+    <sofa:reference jvm-first="false" id="lazyServiceDubbo" interface="com.alipay.sofa.rpc.test.bean.bean.lazy.LazyService">
         <sofa:binding.dubbo>
             <sofa:global-attrs lazy="true"/>
         </sofa:binding.dubbo>
-    </sofa:reference>-->
+    </sofa:reference>
 
     <!-- connectionNum -->
     <bean id="connectionNumServiceImpl" class="com.alipay.sofa.smoke.tests.rpc.boot.bean.connectionnum.ConnectionNumServiceImpl"/>
@@ -183,7 +181,4 @@
                     interface="io.grpc.examples.helloworld.SofaGreeterTriple$IGreeter">
         <sofa:binding.tri/>
     </sofa:reference>
-
-    <!-- Annotation TestCase -->
-    <context:component-scan base-package="com.alipay.sofa.tests.rpc.bean.annotation"/>
 </beans>
diff --git a/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/test/java/com/alipay/sofa/smoke/tests/rpc/boot/SofaBootRpcApplicationTests.java b/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/test/java/com/alipay/sofa/smoke/tests/rpc/boot/SofaBootRpcApplicationTests.java
index e3c533500..2324d0e16 100644
--- a/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/test/java/com/alipay/sofa/smoke/tests/rpc/boot/SofaBootRpcApplicationTests.java
+++ b/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/test/java/com/alipay/sofa/smoke/tests/rpc/boot/SofaBootRpcApplicationTests.java
@@ -36,6 +36,7 @@
 import com.alipay.sofa.smoke.tests.rpc.boot.bean.annotation.AnnotationService;
 import com.alipay.sofa.smoke.tests.rpc.boot.bean.connectionnum.ConnectionNumService;
 import com.alipay.sofa.smoke.tests.rpc.boot.bean.direct.DirectService;
+import com.alipay.sofa.smoke.tests.rpc.boot.bean.dubbo.DubboService;
 import com.alipay.sofa.smoke.tests.rpc.boot.bean.filter.FilterService;
 import com.alipay.sofa.smoke.tests.rpc.boot.bean.generic.GenericParamModel;
 import com.alipay.sofa.smoke.tests.rpc.boot.bean.generic.GenericResultModel;
@@ -118,21 +119,21 @@ public class SofaBootRpcApplicationTests {
     @Autowired
     private RestService                restService;
 
-    /*@Autowired
-    private DubboService dubboService;*/
+    @Autowired
+    private DubboService dubboService;
 
     @Autowired
     private RetriesService             retriesServiceBolt;
 
-    /* @Autowired
-     private RetriesService retriesServiceDubbo;*/
+     @Autowired
+     private RetriesService retriesServiceDubbo;
 
     @Autowired
     @Qualifier(value = "lazyServiceBolt")
     private LazyService                lazyServiceBolt;
 
-    /*@Autowired
-    private LazyService lazyServiceDubbo;*/
+    @Autowired
+    private LazyService lazyServiceDubbo;
 
     @Autowired
     private ConnectionNumService       connectionNumService;
@@ -248,25 +249,22 @@ public void rest() {
         assertThat(restService.sayRest("rest")).isEqualTo("rest");
     }
 
-    /*@Test
+    @Test
     public void testDubbo() {
-        Assert.assertEquals("dubbo", dubboService.sayDubbo("dubbo"));
+        assertThat("dubbo").isEqualTo(dubboService.sayDubbo("dubbo"));
     }
-    */
+
     @Test
     public void retries() throws InterruptedException {
         assertThat(retriesServiceBolt.sayRetry("retries_bolt")).isEqualTo("retries_bolt");
-        //TODO need dubbo version upgrade later 3.0.6 for support jdk17
-        //assertThat(retriesServiceDubbo.sayRetry("retries_dubbo")).isEqualTo("retries_dubbo");
-        //TODO add dubbo expected 6
+        assertThat(retriesServiceDubbo.sayRetry("retries_dubbo")).isEqualTo("retries_dubbo");
         assertThat(RetriesServiceImpl.count.get()).isEqualTo(3);
     }
 
     @Test
     public void lazy() {
         assertThat(lazyServiceBolt.sayLazy("lazy_bolt")).isEqualTo("lazy_bolt");
-        //TODO need dubbo version upgrade later 3.0.6 for support jdk17
-        //assertThat(lazyServiceDubbo.sayLazy("lazy_dubbo")).isEqualTo("lazy_dubbo");
+        assertThat(lazyServiceDubbo.sayLazy("lazy_dubbo")).isEqualTo("lazy_dubbo");
     }
 
     @Test

From 1f732eca2bff5e267c10554cbb8224ae87512bb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=B4=E8=8A=82?= <hzj266771@antgroup.com>
Date: Mon, 27 Mar 2023 12:04:46 +0800
Subject: [PATCH 06/10] 1

---
 sofa-boot-project/sofaboot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sofa-boot-project/sofaboot-dependencies/pom.xml b/sofa-boot-project/sofaboot-dependencies/pom.xml
index 91508d923..924d1d65f 100644
--- a/sofa-boot-project/sofaboot-dependencies/pom.xml
+++ b/sofa-boot-project/sofaboot-dependencies/pom.xml
@@ -47,7 +47,7 @@
         <c3p0.version>0.9.1.1</c3p0.version>
         <common.dbcp.version>1.4</common.dbcp.version>
         <resteasy.version>3.6.3.Final</resteasy.version>
-        <curator.version>5.4.0</curator.version>
+        <curator.version>4.0.1</curator.version>
         <dubbo.version>3.1.8</dubbo.version>
         <zkclient.version>0.11</zkclient.version>
         <nacos.version>1.0.0</nacos.version>

From 482acc540adb066c09d0adb1726288e859d2de44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=B4=E8=8A=82?= <hzj266771@antgroup.com>
Date: Mon, 27 Mar 2023 12:09:31 +0800
Subject: [PATCH 07/10] 1

---
 .../sofa-boot-core/rpc-sofa-boot/pom.xml      | 24 -------------------
 .../sofa-boot-smoke-tests-rpc/pom.xml         |  2 +-
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/pom.xml b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/pom.xml
index 3b33e335d..5f0ca26a0 100644
--- a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/pom.xml
+++ b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/pom.xml
@@ -73,16 +73,6 @@
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>javassist</artifactId>
-                    <groupId>org.javassist</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>spring</artifactId>
-                    <groupId>org.springframework</groupId>
-                </exclusion>
-            </exclusions>
             <optional>true</optional>
         </dependency>
 
@@ -90,20 +80,6 @@
         <dependency>
             <groupId>com.101tec</groupId>
             <artifactId>zkclient</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.zookeeper</groupId>
-                    <artifactId>zookeeper</artifactId>
-                </exclusion>
-            </exclusions>
             <optional>true</optional>
         </dependency>
 
diff --git a/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/pom.xml b/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/pom.xml
index 4e64e34a0..6ccdde86c 100644
--- a/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/pom.xml
+++ b/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/pom.xml
@@ -62,7 +62,7 @@
 
         <!--dubbo-->
         <dependency>
-            <groupId>com.alibaba</groupId>
+            <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo</artifactId>
         </dependency>
 

From d0f45648a989658ff333c99428fcc0dd62a79e6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=B4=E8=8A=82?= <hzj266771@antgroup.com>
Date: Mon, 27 Mar 2023 12:18:55 +0800
Subject: [PATCH 08/10] fix xml

---
 .../src/main/resources/spring/test_all.xml                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/main/resources/spring/test_all.xml b/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/main/resources/spring/test_all.xml
index 0c0579cb8..d3445d1c0 100644
--- a/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/main/resources/spring/test_all.xml
+++ b/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/main/resources/spring/test_all.xml
@@ -121,12 +121,12 @@
     </sofa:service>
     <sofa:reference jvm-first="false" id="dubboService" interface="com.alipay.sofa.tests.rpc.bean.dubbo.DubboService">
         <sofa:binding.dubbo/>
-    </sofa:reference>-->
+    </sofa:reference>
     <!-- retries -->
     <bean id="retriesServiceImpl" class="com.alipay.sofa.smoke.tests.rpc.boot.bean.retry.RetriesServiceImpl"/>
     <sofa:service ref="retriesServiceImpl" interface="com.alipay.sofa.smoke.tests.rpc.boot.bean.retry.RetriesService">
         <sofa:binding.bolt/>
-        <!--<sofa:binding.dubbo/>-->
+        <sofa:binding.dubbo/>
     </sofa:service>
     <sofa:reference jvm-first="false" id="retriesServiceBolt" interface="com.alipay.sofa.smoke.tests.rpc.boot.bean.retry.RetriesService">
         <sofa:binding.bolt>

From 8a54eedbe75ff3ef992e700855bbb1fbdd475527 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=B4=E8=8A=82?= <hzj266771@antgroup.com>
Date: Mon, 27 Mar 2023 16:03:10 +0800
Subject: [PATCH 09/10] update  curator 4.3.0

---
 sofa-boot-project/sofa-boot-core/rpc-sofa-boot/pom.xml    | 6 ++++++
 sofa-boot-project/sofaboot-dependencies/pom.xml           | 8 ++++++--
 .../sofa-boot-smoke-tests-rpc/pom.xml                     | 5 +++++
 .../src/main/resources/spring/test_all.xml                | 8 ++++----
 .../smoke/tests/rpc/boot/SofaBootRpcApplicationTests.java | 2 +-
 5 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/pom.xml b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/pom.xml
index 5f0ca26a0..6db18bcda 100644
--- a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/pom.xml
+++ b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/pom.xml
@@ -57,6 +57,12 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-x-discovery</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-core</artifactId>
diff --git a/sofa-boot-project/sofaboot-dependencies/pom.xml b/sofa-boot-project/sofaboot-dependencies/pom.xml
index 924d1d65f..bd88ff608 100644
--- a/sofa-boot-project/sofaboot-dependencies/pom.xml
+++ b/sofa-boot-project/sofaboot-dependencies/pom.xml
@@ -47,7 +47,7 @@
         <c3p0.version>0.9.1.1</c3p0.version>
         <common.dbcp.version>1.4</common.dbcp.version>
         <resteasy.version>3.6.3.Final</resteasy.version>
-        <curator.version>4.0.1</curator.version>
+        <curator.version>4.3.0</curator.version>
         <dubbo.version>3.1.8</dubbo.version>
         <zkclient.version>0.11</zkclient.version>
         <nacos.version>1.0.0</nacos.version>
@@ -638,7 +638,11 @@
                 <artifactId>curator-recipes</artifactId>
                 <version>${curator.version}</version>
             </dependency>
-
+            <dependency>
+                <groupId>org.apache.curator</groupId>
+                <artifactId>curator-x-discovery</artifactId>
+                <version>${curator.version}</version>
+            </dependency>
             <!-- resteasy -->
             <dependency>
                 <groupId>org.jboss.resteasy</groupId>
diff --git a/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/pom.xml b/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/pom.xml
index 6ccdde86c..31ae9cef5 100644
--- a/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/pom.xml
+++ b/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/pom.xml
@@ -81,6 +81,11 @@
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-x-discovery</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/main/resources/spring/test_all.xml b/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/main/resources/spring/test_all.xml
index d3445d1c0..1ebee5707 100644
--- a/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/main/resources/spring/test_all.xml
+++ b/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/main/resources/spring/test_all.xml
@@ -116,10 +116,10 @@
 
     <!-- dubbo -->
     <bean id="dubboServiceImpl" class="com.alipay.sofa.smoke.tests.rpc.boot.bean.dubbo.DubboServiceImpl"/>
-    <sofa:service ref="dubboServiceImpl" interface="com.alipay.sofa.tests.rpc.bean.dubbo.DubboService">
+    <sofa:service ref="dubboServiceImpl" interface="com.alipay.sofa.smoke.tests.rpc.boot.bean.dubbo.DubboService">
         <sofa:binding.dubbo/>
     </sofa:service>
-    <sofa:reference jvm-first="false" id="dubboService" interface="com.alipay.sofa.tests.rpc.bean.dubbo.DubboService">
+    <sofa:reference jvm-first="false" id="dubboService" interface="com.alipay.sofa.smoke.tests.rpc.boot.bean.dubbo.DubboService">
         <sofa:binding.dubbo/>
     </sofa:reference>
     <!-- retries -->
@@ -134,7 +134,7 @@
         </sofa:binding.bolt>
     </sofa:reference>
     <sofa:reference jvm-first="false" id="retriesServiceDubbo"
-                    interface="com.alipay.sofa.rpc.test.bean.bean.retry.RetriesService">
+                    interface="com.alipay.sofa.smoke.tests.rpc.boot.bean.retry.RetriesService">
         <sofa:binding.dubbo>
             <sofa:global-attrs retries="2"/>
         </sofa:binding.dubbo>
@@ -153,7 +153,7 @@
         </sofa:binding.bolt>
     </sofa:reference>
 
-    <sofa:reference jvm-first="false" id="lazyServiceDubbo" interface="com.alipay.sofa.rpc.test.bean.bean.lazy.LazyService">
+    <sofa:reference jvm-first="false" id="lazyServiceDubbo" interface="com.alipay.sofa.smoke.tests.rpc.boot.bean.lazy.LazyService">
         <sofa:binding.dubbo>
             <sofa:global-attrs lazy="true"/>
         </sofa:binding.dubbo>
diff --git a/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/test/java/com/alipay/sofa/smoke/tests/rpc/boot/SofaBootRpcApplicationTests.java b/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/test/java/com/alipay/sofa/smoke/tests/rpc/boot/SofaBootRpcApplicationTests.java
index 2324d0e16..06afe0529 100644
--- a/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/test/java/com/alipay/sofa/smoke/tests/rpc/boot/SofaBootRpcApplicationTests.java
+++ b/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/test/java/com/alipay/sofa/smoke/tests/rpc/boot/SofaBootRpcApplicationTests.java
@@ -85,7 +85,7 @@
  * @author yuanxuan
  * @version : SofaBootRpcApplicationTests.java, v 0.1 15:19 yuanxuan Exp $
  */
-@SpringBootTest(classes = RpcSofaBootApplication.class, properties = {
+@SpringBootTest(classes = RpcSofaBootApplication.class, properties = {"sofa.boot.actuator.health.skipAll=true",
                                                                       "sofa.boot.rpc.rest-swagger=true",
                                                                       "sofa.boot.rpc.enable-swagger=true",
                                                                       "sofa.boot.rpc.defaultTracer=" })

From 6a591ab5aa06e37cfadbaf03b5745805fdd2da3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=B4=E8=8A=82?= <hzj266771@antgroup.com>
Date: Wed, 29 Mar 2023 14:29:47 +0800
Subject: [PATCH 10/10] fix dubbo ut

---
 sofa-boot-project/sofaboot-dependencies/pom.xml |  2 +-
 .../rpc/boot/SofaBootRpcApplicationTests.java   | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/sofa-boot-project/sofaboot-dependencies/pom.xml b/sofa-boot-project/sofaboot-dependencies/pom.xml
index bd88ff608..9ac48103c 100644
--- a/sofa-boot-project/sofaboot-dependencies/pom.xml
+++ b/sofa-boot-project/sofaboot-dependencies/pom.xml
@@ -50,7 +50,7 @@
         <curator.version>4.3.0</curator.version>
         <dubbo.version>3.1.8</dubbo.version>
         <zkclient.version>0.11</zkclient.version>
-        <nacos.version>1.0.0</nacos.version>
+        <nacos.version>2.0.3</nacos.version>
         <swagger.version>1.6.7</swagger.version>
         <swagger2.version>2.2.8</swagger2.version>
         <grpc.version>1.51.1</grpc.version>
diff --git a/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/test/java/com/alipay/sofa/smoke/tests/rpc/boot/SofaBootRpcApplicationTests.java b/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/test/java/com/alipay/sofa/smoke/tests/rpc/boot/SofaBootRpcApplicationTests.java
index 06afe0529..b5b391c99 100644
--- a/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/test/java/com/alipay/sofa/smoke/tests/rpc/boot/SofaBootRpcApplicationTests.java
+++ b/sofa-boot-tests/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/test/java/com/alipay/sofa/smoke/tests/rpc/boot/SofaBootRpcApplicationTests.java
@@ -85,13 +85,18 @@
  * @author yuanxuan
  * @version : SofaBootRpcApplicationTests.java, v 0.1 15:19 yuanxuan Exp $
  */
-@SpringBootTest(classes = RpcSofaBootApplication.class, properties = {"sofa.boot.actuator.health.skipAll=true",
+@SpringBootTest(classes = RpcSofaBootApplication.class, properties = {
+                                                                      "sofa.boot.actuator.health.skipAll=true",
                                                                       "sofa.boot.rpc.rest-swagger=true",
                                                                       "sofa.boot.rpc.enable-swagger=true",
                                                                       "sofa.boot.rpc.defaultTracer=" })
 @Import(SofaBootRpcApplicationTests.RpcAllConfiguration.class)
 public class SofaBootRpcApplicationTests {
 
+    static {
+        System.setProperty("dubbo.config.mode", "IGNORE");
+    }
+
     @Autowired
     private HelloSyncService           helloSyncService;
 
@@ -120,20 +125,20 @@ public class SofaBootRpcApplicationTests {
     private RestService                restService;
 
     @Autowired
-    private DubboService dubboService;
+    private DubboService               dubboService;
 
     @Autowired
     private RetriesService             retriesServiceBolt;
 
-     @Autowired
-     private RetriesService retriesServiceDubbo;
+    @Autowired
+    private RetriesService             retriesServiceDubbo;
 
     @Autowired
     @Qualifier(value = "lazyServiceBolt")
     private LazyService                lazyServiceBolt;
 
     @Autowired
-    private LazyService lazyServiceDubbo;
+    private LazyService                lazyServiceDubbo;
 
     @Autowired
     private ConnectionNumService       connectionNumService;
@@ -258,7 +263,7 @@ public void testDubbo() {
     public void retries() throws InterruptedException {
         assertThat(retriesServiceBolt.sayRetry("retries_bolt")).isEqualTo("retries_bolt");
         assertThat(retriesServiceDubbo.sayRetry("retries_dubbo")).isEqualTo("retries_dubbo");
-        assertThat(RetriesServiceImpl.count.get()).isEqualTo(3);
+        assertThat(RetriesServiceImpl.count.get()).isEqualTo(6);
     }
 
     @Test