[#638]upgrade servicecomb dependencies to 2.7.0 (#640)

huaweicloud · Apr 7, 2022 · bc1ae83 · bc1ae83
1 parent f347374
commit bc1ae83
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -67,7 +67,7 @@ Including [Apache ServiceComb](http://servicecomb.apache.org) and [ServiceStage]
 2. [Quick Start and Samples](https://github.com/huaweicloud/spring-cloud-huawei-samples)
 
 [ServiceStage]: https://support.huaweicloud.com/intl/en-us/productdesc-servicestage/ss_productdesc_0001.html
-[CSE]: https://support.huaweicloud.com/intl/en-us/devg-servicestage/ss-devg-0002.html
+[CSE]: https://www.huaweicloud.com/intl/en-us/product/cse.html
 [Service Registry]: https://support.huaweicloud.com/intl/en-us/devg-servicestage/ss-devg-0017.html
 [Configuration Center]: https://support.huaweicloud.com/intl/en-us/devg-servicestage/ss-devg-0018.html
 [Request Marker-based Governance]: https://support.huaweicloud.com/intl/en-us/devg-servicestage/ss-devg-0020.html

diff --git a/README_CN.md b/README_CN.md
@@ -67,13 +67,13 @@
 
 [ServiceStage]: https://support.huaweicloud.com/usermanual-servicestage/servicestage_user_0400.html
 
-[CSE]: https://support.huaweicloud.com/devg-servicestage/ss-devg-0002.html
+[CSE]: https://support.huaweicloud.com/cse/index.html
 
-[Service Registry]: https://support.huaweicloud.com/devg-servicestage/ss-devg-0017.html
+[Service Registry]: https://support.huaweicloud.com/devg-cse/cse_devg_0018.html
 
-[Configuration Center]: https://support.huaweicloud.com/devg-servicestage/ss-devg-0018.html
+[Configuration Center]: https://support.huaweicloud.com/devg-cse/cse_devg_0020.html
 
-[Request Marker-based Governance]: https://support.huaweicloud.com/devg-servicestage/ss-devg-0020.html
+[Request Marker-based Governance]: https://support.huaweicloud.com/devg-cse/cse_devg_0025.html
 
 [Canary release features]: https://support.huaweicloud.com/devg-servicestage/ss-devg-0023.html
 

diff --git a/integration-tests/cse-v2/README.md b/integration-tests/cse-v2/README.md
@@ -1,10 +1,6 @@
 # 使用微服务引擎2.0的测试用例
 
-* 参考：https://github.com/apache/servicecomb-service-center/tree/master/ux 安装微服务引擎2.0
-
-* 设置环境变量:
-  * CSE_V2_SC: 注册中心的地址
-  * CSE_V2_CC: 配置中心的地址
+* 参考：https://support.huaweicloud.com/devg-cse/cse_devg_0036.html 安装微服务引擎2.0
 
 * 依次启动 provider、consumer、gateway
 

diff --git a/integration-tests/cse-v2/consumer/src/main/resources/bootstrap.yml b/integration-tests/cse-v2/consumer/src/main/resources/bootstrap.yml
@@ -25,13 +25,13 @@ spring:
       discovery:
         enabled: true
         watch: false
-        address: ${CSE_V2_SC}
+        address: ${PAAS_CSE_SC_ENDPOINT:http://127.0.0.1:30100}
         appName: cse-v2-test-application
         serviceName: ${spring.application.name}
         version: 0.0.1
         healthCheckInterval: 30
       config:
-        serverAddr: ${CSE_V2_CC}
+        serverAddr: ${PAAS_CSE_CC_ENDPOINT:http://127.0.0.1:30110}
         serverType: kie
         kie:
           customLabel: public

diff --git a/integration-tests/cse-v2/gateway/src/main/resources/bootstrap.yml b/integration-tests/cse-v2/gateway/src/main/resources/bootstrap.yml
@@ -26,11 +26,11 @@ spring:
         appName: cse-v2-test-application
         serviceName: ${spring.application.name}
         watch: false
-        address: ${CSE_V2_SC}
+        address: ${PAAS_CSE_SC_ENDPOINT:http://127.0.0.1:30100}
         version: 0.0.1
         healthCheckInterval: 30
       config:
-        serverAddr: ${CSE_V2_CC}
+        serverAddr: ${PAAS_CSE_CC_ENDPOINT:http://127.0.0.1:30110}
         serverType: kie
 
 #      credentials:

diff --git a/integration-tests/cse-v2/provider/src/main/resources/bootstrap.yml b/integration-tests/cse-v2/provider/src/main/resources/bootstrap.yml
@@ -25,13 +25,13 @@ spring:
       discovery:
         enabled: true
         watch: false
-        address: ${CSE_V2_SC}
+        address: ${PAAS_CSE_SC_ENDPOINT:http://127.0.0.1:30100}
         appName: cse-v2-test-application
         serviceName: ${spring.application.name}
         version: 0.0.1
         healthCheckInterval: 30
       config:
-        serverAddr: ${CSE_V2_CC}
+        serverAddr: ${PAAS_CSE_CC_ENDPOINT:http://127.0.0.1:30110}
         serverType: kie
 
 #      credentials:

diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
     <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-build</artifactId>
     <!-- This version should match spring-cloud-dependencies 'spring-cloud-build.version' -->
-    <version>2.2.3.RELEASE</version>
+    <version>2.3.1.RELEASE</version>
   </parent>
 
   <groupId>com.huaweicloud</groupId>
@@ -39,7 +39,7 @@
      import spring-framework-bom. No need configure spring version. -->
     <spring-cloud.version>Hoxton.SR9</spring-cloud.version>
     <spring-boot.version>2.3.5.RELEASE</spring-boot.version>
-    <servicecomb.version>2.6.3</servicecomb.version>
+    <servicecomb.version>2.7.0</servicecomb.version>
   </properties>
 
   <modules>