sofastack · HzjNeverStop · Mar 29, 2023 · Mar 23, 2023 · Mar 23, 2023 · Mar 23, 2023
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
@@ -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>
@@ -71,39 +77,15 @@
 
         <!--dubbo-->
         <dependency>
-            <groupId>com.alibaba</groupId>
+            <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>
 
         <!--zk-->
         <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>
-   
8000
             <exclusion>
-                    <groupId>org.apache.zookeeper</groupId>
-                    <artifactId>zookeeper</artifactId>
-                </exclusion>
-            </exclusions>
             <optional>true</optional>
         </dependency>
 

diff --git 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>
@@ -46,10 +47,10 @@
         <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>
-        <dubbo.version>2.6.9</dubbo.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>
+        <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>
@@ -637,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>
@@ -684,7 +689,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/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>
 
@@ -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/...ts/sofa-boot-smoke-tests/sofa-boot-smoke-tests-rpc/src/main/resources/spring/test_all.xml b/...ts/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,36 +115,36 @@
     </sofa:reference>
 
     <!-- dubbo -->
-    <!--<bean id="dubboServiceImpl" class="com.alipay.sofa.tests.rpc.bean.dubbo.DubboServiceImpl"/>
-    <sofa:service ref="dubboServiceImpl" interface="com.alipay.sofa.tests.rpc.bean.dubbo.DubboService">
+    <bean id="dubboServiceImpl" class="com.alipay.sofa.smoke.tests.rpc.boot.bean.dubbo.DubboServiceImpl"/>
+    <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>-->
+    </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>
             <sofa:global-attrs retries="2"/>
         </sofa:binding.bolt>
     </sofa:reference>
-   <!-- <sofa:reference jvm-first="false" id="retriesServiceDubbo"
-                    interface="com.alipay.sofa.rpc.test.bean.bean.retry.RetriesService">
+    <sofa:reference jvm-first="false" id="retriesServiceDubbo"
+                    interface="com.alipay.sofa.smoke.tests.rpc.boot.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.smoke.tests.rpc.boot.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/...s-rpc/src/test/java/com/alipay/sofa/smoke/tests/rpc/boot/SofaBootRpcApplicationTests.java b/...s-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;
@@ -85,12 +86,17 @@
  * @version : SofaBootRpcApplicationTests.java, v 0.1 15:19 yuanxuan Exp $
  */
 @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;
 
@@ -118,21 +124,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 +254,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(RetriesServiceImpl.count.get()).isEqualTo(3);
+        assertThat(retriesServiceDubbo.sayRetry("retries_dubbo")).isEqualTo("retries_dubbo");
+        assertThat(RetriesServiceImpl.count.get()).isEqualTo(6);
     }
 
     @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