You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by al...@apache.org on 2022/12/27 06:35:37 UTC
[dubbo-samples] branch master updated: Add Nacos case test (#658)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 849a55d6 Add Nacos case test (#658)
849a55d6 is described below
commit 849a55d6f9a20d8acbc9afd31bd94baecbfc5fef
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Tue Dec 27 14:35:31 2022 +0800
Add Nacos case test (#658)
---
.../case-configuration.yml | 2 +-
...{case-versions.conf => case-version-sources.conf} | 9 ++-------
.../dubbo-samples-nacos-registry/case-versions.conf | 2 ++
.../dubbo-samples-nacos-registry/pom.xml | 20 ++++++++++++++++++++
4 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-configuration.yml b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-configuration.yml
index c2fe257c..ef424157 100644
--- a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-configuration.yml
+++ b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-configuration.yml
@@ -18,7 +18,7 @@ timeout: 300
services:
nacos:
- image: nacos/nacos-server:${nacos.version:2.0.0}
+ image: nacos/nacos-server:${nacos-server.version:2.0.0}
environment:
- PREFER_HOST_MODE=hostname
- MODE=standalone
diff --git a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-versions.conf b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-version-sources.conf
similarity index 81%
copy from 3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-versions.conf
copy to 3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-version-sources.conf
index 20c45c86..5b1472ab 100644
--- a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-versions.conf
+++ b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-version-sources.conf
@@ -16,10 +16,5 @@
# limitations under the License.
#
-
-# Supported component versions of the test case
-
-# Spring app
-dubbo.version=2.7*, 3.*
-spring.version=4.*, 5.*
-java.version= [<= 11]
+nacos.version=https://repo1.maven.org/maven2/com/alibaba/nacos/nacos-client/maven-metadata.xml
+#nacos-server.version=https://hub.docker.com/v2/namespaces/nacos/repositories/nacos-server/tags
\ No newline at end of file
diff --git a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-versions.conf b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-versions.conf
index 20c45c86..1001c271 100644
--- a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-versions.conf
+++ b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-versions.conf
@@ -23,3 +23,5 @@
dubbo.version=2.7*, 3.*
spring.version=4.*, 5.*
java.version= [<= 11]
+nacos.version="!*-BETA","!*-ALPHA*",2.*
+#nacos-server.version="!*-slim","!*-BETA",2.*
diff --git a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/pom.xml b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/pom.xml
index 05985bbc..17ec182d 100644
--- a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/pom.xml
+++ b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/pom.xml
@@ -35,6 +35,7 @@
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<slf4j.version>1.7.25</slf4j.version>
+ <nacos.version>2.1.2</nacos.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
</properties>
@@ -86,10 +87,23 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter-nacos</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.alibaba.nacos</groupId>
+ <artifactId>nacos-client</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry-nacos</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.alibaba.nacos</groupId>
+ <artifactId>nacos-client</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -98,6 +112,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.alibaba.nacos</groupId>
+ <artifactId>nacos-client</artifactId>
+ <version>${nacos.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org