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 366e9c7 Organize dubbo version (#380)
366e9c7 is described below
commit 366e9c7eaa78ec4541938d97b110b0079bfe2cc5
Author: Gong Dewei <kyl...@qq.com>
AuthorDate: Sat Oct 9 16:01:47 2021 +0800
Organize dubbo version (#380)
* Organize dubbo version
* test stable version in dubbo 3 nightly build
* update dubbo stable version to 3.0.3
---
.github/workflows/nightly-dubbo-3.yml | 1 +
dubbo-samples-async/dubbo-samples-async-onerror/pom.xml | 15 +++++++--------
dubbo-samples-edas/dubbo-samples-edas-consumer/pom.xml | 3 +--
dubbo-samples-jetty/pom.xml | 6 ++----
.../dubbo-samples-resilience4j-filter/pom.xml | 6 ++----
.../dubbo-samples-resilience4j-springboot2/pom.xml | 6 ++----
dubbo-samples-tengine/pom.xml | 3 +--
7 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/.github/workflows/nightly-dubbo-3.yml
b/.github/workflows/nightly-dubbo-3.yml
index 19bab52..af45866 100644
--- a/.github/workflows/nightly-dubbo-3.yml
+++ b/.github/workflows/nightly-dubbo-3.yml
@@ -23,6 +23,7 @@ env:
VERSIONS_LIMIT: 12
#candidate versions (the dubbo snapshot version will be extracted from
pom.xml and appended before CANDIDATE_VERSIONS )
CANDIDATE_VERSIONS: '
+ dubbo.version: 3.0.3;
spring.version: 4.2.9.RELEASE, 4.3.30.RELEASE, 5.1.20.RELEASE, 5.3.3;
spring-boot.version: 1.1.12.RELEASE, 1.2.8.RELEASE, 1.3.8.RELEASE,
1.4.7.RELEASE, 1.5.22.RELEASE;
spring-boot.version: 2.0.9.RELEASE, 2.1.18.RELEASE, 2.2.12.RELEASE,
2.3.7.RELEASE, 2.4.1
diff --git a/dubbo-samples-async/dubbo-samples-async-onerror/pom.xml
b/dubbo-samples-async/dubbo-samples-async-onerror/pom.xml
index ee5f21b..1b63656 100644
--- a/dubbo-samples-async/dubbo-samples-async-onerror/pom.xml
+++ b/dubbo-samples-async/dubbo-samples-async-onerror/pom.xml
@@ -33,8 +33,7 @@
<target.level>1.8</target.level>
<spring.version>4.3.16.RELEASE</spring.version>
<dubbo.version>3.0.2.1</dubbo.version>
-
<dubbo.configcenter.zookeeper.version>3.0.2.1</dubbo.configcenter.zookeeper.version>
- <zookeeper.version>3.4.14</zookeeper.version>
+ <zookeeper.version>3.4.13</zookeeper.version>
<curator.version>4.0.1</curator.version>
<validation-api.version>1.1.0.Final</validation-api.version>
<hibernate-validator.version>4.2.0.Final</hibernate-validator.version>
@@ -96,7 +95,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter-zookeeper</artifactId>
- <version>${dubbo.configcenter.zookeeper.version}</version>
+ <version>${dubbo.version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
@@ -197,11 +196,11 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-configcenter-zookeeper</artifactId>
- <version>${dubbo.configcenter.zookeeper.version}</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.dubbo</groupId>-->
+<!-- <artifactId>dubbo-configcenter-zookeeper</artifactId>-->
+<!-- <version>${dubbo.version}</version>-->
+<!-- </dependency>-->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
diff --git a/dubbo-samples-edas/dubbo-samples-edas-consumer/pom.xml
b/dubbo-samples-edas/dubbo-samples-edas-consumer/pom.xml
index 90fd6bf..c9cb814 100644
--- a/dubbo-samples-edas/dubbo-samples-edas-consumer/pom.xml
+++ b/dubbo-samples-edas/dubbo-samples-edas-consumer/pom.xml
@@ -14,7 +14,6 @@
<properties>
<spring-boot.version>2.1.1.RELEASE</spring-boot.version>
<dubbo.version>3.0.2.1</dubbo.version>
- <dubbo.boot-starter.version>3.0.2.1</dubbo.boot-starter.version>
</properties>
<dependencyManagement>
@@ -62,7 +61,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${dubbo.boot-starter.version}</version>
+ <version>${dubbo.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/dubbo-samples-jetty/pom.xml b/dubbo-samples-jetty/pom.xml
index fdc47e5..210dffb 100644
--- a/dubbo-samples-jetty/pom.xml
+++ b/dubbo-samples-jetty/pom.xml
@@ -32,9 +32,7 @@
<target.level>1.8</target.level>
<spring.version>4.3.16.RELEASE</spring.version>
<dubbo.version>3.0.2.1</dubbo.version>
- <dubbo.rpc.version>3.0.2.1</dubbo.rpc.version>
<zookeeper.version>3.4.13</zookeeper.version>
-
<dubbo.configcenter.zookeeper.version>3.0.2.1</dubbo.configcenter.zookeeper.version>
<curator.version>4.0.1</curator.version>
<validation-api.version>1.1.0.Final</validation-api.version>
<hibernate-validator.version>4.2.0.Final</hibernate-validator.version>
@@ -94,7 +92,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-rpc-rest</artifactId>
- <version>${dubbo.rpc.version}</version>
+ <version>${dubbo.version}</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
@@ -193,7 +191,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter-zookeeper</artifactId>
- <version>${dubbo.configcenter.zookeeper.version}</version>
+ <version>${dubbo.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
diff --git
a/dubbo-samples-resilience4j/dubbo-samples-resilience4j-filter/pom.xml
b/dubbo-samples-resilience4j/dubbo-samples-resilience4j-filter/pom.xml
index 4a5cca8..02f5365 100644
--- a/dubbo-samples-resilience4j/dubbo-samples-resilience4j-filter/pom.xml
+++ b/dubbo-samples-resilience4j/dubbo-samples-resilience4j-filter/pom.xml
@@ -33,9 +33,7 @@
<target.level>1.8</target.level>
<spring.version>4.3.16.RELEASE</spring.version>
<dubbo.version>3.0.2.1</dubbo.version>
- <dubbo.rpc.version>3.0.2.1</dubbo.rpc.version>
<zookeeper.version>3.4.13</zookeeper.version>
-
<dubbo.configcenter.zookeeper.version>3.0.2.1</dubbo.configcenter.zookeeper.version>
<curator.version>4.0.1</curator.version>
<validation-api.version>1.1.0.Final</validation-api.version>
<hibernate-validator.version>4.2.0.Final</hibernate-validator.version>
@@ -93,7 +91,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-rpc-rest</artifactId>
- <version>${dubbo.rpc.version}</version>
+ <version>${dubbo.version}</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
@@ -192,7 +190,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter-zookeeper</artifactId>
- <version>${dubbo.configcenter.zookeeper.version}</version>
+ <version>${dubbo.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
diff --git
a/dubbo-samples-resilience4j/dubbo-samples-resilience4j-springboot2/pom.xml
b/dubbo-samples-resilience4j/dubbo-samples-resilience4j-springboot2/pom.xml
index 9d647df..a0f2e7e 100644
--- a/dubbo-samples-resilience4j/dubbo-samples-resilience4j-springboot2/pom.xml
+++ b/dubbo-samples-resilience4j/dubbo-samples-resilience4j-springboot2/pom.xml
@@ -34,9 +34,7 @@
<target.level>1.8</target.level>
<spring.version>4.3.16.RELEASE</spring.version>
<dubbo.version>3.0.2.1</dubbo.version>
- <dubbo.rpc.version>3.0.2.1</dubbo.rpc.version>
<zookeeper.version>3.4.13</zookeeper.version>
-
<dubbo.configcenter.zookeeper.version>3.0.2.1</dubbo.configcenter.zookeeper.version>
<curator.version>4.0.1</curator.version>
<validation-api.version>1.1.0.Final</validation-api.version>
<hibernate-validator.version>4.2.0.Final</hibernate-validator.version>
@@ -94,7 +92,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-rpc-rest</artifactId>
- <version>${dubbo.rpc.version}</version>
+ <version>${dubbo.version}</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
@@ -193,7 +191,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter-zookeeper</artifactId>
- <version>${dubbo.configcenter.zookeeper.version}</version>
+ <version>${dubbo.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
diff --git a/dubbo-samples-tengine/pom.xml b/dubbo-samples-tengine/pom.xml
index 968679d..cec48e6 100644
--- a/dubbo-samples-tengine/pom.xml
+++ b/dubbo-samples-tengine/pom.xml
@@ -9,7 +9,6 @@
<properties>
<skip_maven_deploy>true</skip_maven_deploy>
<dubbo.version>3.0.2.1</dubbo.version>
- <dubbo.boot-starter.version>3.0.2.1</dubbo.boot-starter.version>
<spring-boot.version>2.1.5.RELEASE</spring-boot.version>
</properties>
<modules>
@@ -30,7 +29,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${dubbo.boot-starter.version}</version>
+ <version>${dubbo.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org
For additional commands, e-mail: notifications-h...@dubbo.apache.org
