From 8c5e745d1bb24113a9ec5cb1eb2beb2e44dde9f9 Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Thu, 17 Sep 2020 14:37:43 +0800 Subject: [PATCH 01/11] Upgrade the version to be 2.2.3-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 64b45518..92bf32ae 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ - 2.2.2.RELEASE + 2.2.3-SNAPSHOT 2.2.5.RELEASE From b23dd033fbd269a0d00e2e27a8163a866c1baf9f Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Thu, 17 Sep 2020 14:43:30 +0800 Subject: [PATCH 02/11] Polish alibaba/spring-cloud-alibaba#1723 : 2.2.2.RELEASE undertow stop shows "Failed to stop bean 'nacosWatch'" --- spring-cloud-alibaba-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index 7a1870ce..98d2b4e6 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -24,7 +24,7 @@ 1.3.0 1.3.2 0.8.0 - 1.0.9 + 1.0.10 2.2.1 From c3afdad2b1eaf40b983b619bbe292f5065888962 Mon Sep 17 00:00:00 2001 From: K Date: Thu, 17 Sep 2020 15:00:25 +0800 Subject: [PATCH 03/11] remove useless properties remove useless properties --- pom.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 64b45518..5ed30fe3 100644 --- a/pom.xml +++ b/pom.xml @@ -93,10 +93,6 @@ 2.2.5.RELEASE 2.2.3.RELEASE - 4.12 - 3.0 - 1.7.25 - 2.7.8 4.0.1 @@ -449,4 +445,4 @@ - \ No newline at end of file + From 64c8ebf536457c01e323e569eecdac527837cdd6 Mon Sep 17 00:00:00 2001 From: K Date: Thu, 17 Sep 2020 15:01:15 +0800 Subject: [PATCH 04/11] update spring-cloud-dependencies-parent version update spring-cloud-dependencies-parent version --- spring-cloud-alibaba-dependencies/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index 7a1870ce..22f8de02 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-cloud-dependencies-parent org.springframework.cloud - 2.2.0.RELEASE + spring-cloud-dependencies-parent + 2.3.1.RELEASE From 0e77fce0129e62baaab3e5689f416b32a3a2b77f Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Thu, 17 Sep 2020 15:09:33 +0800 Subject: [PATCH 05/11] Polish alibaba/spring-cloud-alibaba#1727 : upgrade rocketmq-spring-boot-starter --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 92bf32ae..5ffc8f04 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ 4.0.1 - 2.0.2 + 2.1.1 3.7.0 From bb9dbba7d16d0a9fd5cde903e08bc199b1ba8667 Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Thu, 17 Sep 2020 16:41:07 +0800 Subject: [PATCH 06/11] Polish alibaba/spring-cloud-alibaba#1741 : [Infrastructure] Upgrading the Nacos Client --- spring-cloud-alibaba-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index 98d2b4e6..d5d4a47f 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -22,7 +22,7 @@ 1.8.0 3.1.0 1.3.0 - 1.3.2 + 1.3.3 0.8.0 1.0.10 From 24de18a00c65a9c5d315e563eee17d2ce06b92fc Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Thu, 17 Sep 2020 17:27:33 +0800 Subject: [PATCH 07/11] Polish alibaba/spring-cloud-alibaba#1727 : rollback rocketmq-spring-boot-starter --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1885f6c0..9a6d9682 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ 4.0.1 - 2.1.1 + 2.0.2 3.7.0 From ea3f76c77f99552572123187a9e5aff19dba776f Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Thu, 17 Sep 2020 17:41:33 +0800 Subject: [PATCH 08/11] Remove the useless properties --- spring-cloud-alibaba-dependencies/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index 0593f893..fbd53213 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -20,7 +20,6 @@ 2.2.2.RELEASE 1.8.0 - 3.1.0 1.3.0 1.3.3 0.8.0 From b4abf6db15198b62daf9bc71485821ed6efb6fc6 Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Thu, 17 Sep 2020 21:31:59 +0800 Subject: [PATCH 09/11] Update the version to be 2.2.3.RELEASE --- spring-cloud-alibaba-dependencies/pom.xml | 2 +- .../src/main/asciidoc-zh/dependency-management.adoc | 2 +- .../src/main/asciidoc/dependency-management.adoc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index fbd53213..f6c66b95 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -18,7 +18,7 @@ Spring Cloud Alibaba Dependencies - 2.2.2.RELEASE + 2.2.3.RELEASE 1.8.0 1.3.0 1.3.3 diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/dependency-management.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/dependency-management.adoc index 5a3dc333..5300db70 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/dependency-management.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/dependency-management.adoc @@ -10,7 +10,7 @@ Spring Cloud Alibaba BOM 包含了它所使用的所有依赖的版本。 com.alibaba.cloud spring-cloud-alibaba-dependencies - 2.2.2.RELEASE + 2.2.3.RELEASE pom import diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/dependency-management.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc/dependency-management.adoc index 789d1aed..9601c509 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc/dependency-management.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc/dependency-management.adoc @@ -8,7 +8,7 @@ If you’re a Maven Central user, add our BOM to your pom.xml com.alibaba.cloud spring-cloud-alibaba-dependencies - 2.2.2.RELEASE + 2.2.3.RELEASE pom import From 6617c9aef8824fb18c89c4ee339f7ca2bd75e538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=99=E9=BB=84=E5=BD=AC?= Date: Fri, 18 Sep 2020 11:26:32 +0800 Subject: [PATCH 10/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7dd069c5..cc75f59c 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ These artifacts are available from Maven Central and Spring Release repository v com.alibaba.cloud spring-cloud-alibaba-dependencies - 2.2.2.RELEASE + 2.2.3.RELEASE pom import From 29b955fffb1edbef552ed8a44b1b72dde7318a45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=99=E9=BB=84=E5=BD=AC?= Date: Fri, 18 Sep 2020 11:27:20 +0800 Subject: [PATCH 11/11] Update README-zh.md --- README-zh.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README-zh.md b/README-zh.md index ca01258e..43856826 100644 --- a/README-zh.md +++ b/README-zh.md @@ -70,7 +70,7 @@ Spring Cloud 使用 Maven 来构建,最快的使用方式是将本项目 clone com.alibaba.cloud spring-cloud-alibaba-dependencies - 2.2.2.RELEASE + 2.2.3.RELEASE pom import