From 55953ae78d853bffc9fa305b5e275cffaedd438a Mon Sep 17 00:00:00 2001 From: KomachiSion <263976490@qq.com> Date: Thu, 14 Jan 2021 17:06:45 +0800 Subject: [PATCH 1/6] Upgrade to 2.0.0-ALPHA2 --- address/pom.xml | 2 +- api/pom.xml | 2 +- auth/pom.xml | 2 +- client/pom.xml | 2 +- cmdb/pom.xml | 2 +- common/pom.xml | 2 +- config/pom.xml | 2 +- consistency/pom.xml | 2 +- console/pom.xml | 2 +- core/pom.xml | 2 +- distribution/pom.xml | 2 +- example/pom.xml | 2 +- istio/pom.xml | 2 +- naming/pom.xml | 2 +- pom.xml | 4 ++-- sys/pom.xml | 2 +- test/pom.xml | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/address/pom.xml b/address/pom.xml index 2362cd968..30bef3c09 100644 --- a/address/pom.xml +++ b/address/pom.xml @@ -19,7 +19,7 @@ nacos-all com.alibaba.nacos - 2.0.0-1-SNAPSHOT + 2.0.0-ALPHA2 4.0.0 diff --git a/api/pom.xml b/api/pom.xml index 0e8c2d91e..9a93caa89 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -19,7 +19,7 @@ com.alibaba.nacos nacos-all - 2.0.0-1-SNAPSHOT + 2.0.0-ALPHA2 4.0.0 diff --git a/auth/pom.xml b/auth/pom.xml index 89aa9d08f..47f8b1792 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -21,7 +21,7 @@ com.alibaba.nacos nacos-all - 2.0.0-1-SNAPSHOT + 2.0.0-ALPHA2 ../pom.xml 4.0.0 diff --git a/client/pom.xml b/client/pom.xml index 0abb77c66..936387fa7 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -19,7 +19,7 @@ com.alibaba.nacos nacos-all - 2.0.0-1-SNAPSHOT + 2.0.0-ALPHA2 ../pom.xml diff --git a/cmdb/pom.xml b/cmdb/pom.xml index b62c026e9..62adedfae 100644 --- a/cmdb/pom.xml +++ b/cmdb/pom.xml @@ -21,7 +21,7 @@ nacos-all com.alibaba.nacos - 2.0.0-1-SNAPSHOT + 2.0.0-ALPHA2 ../pom.xml 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index a75368f06..4fc5ee8b2 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -21,7 +21,7 @@ com.alibaba.nacos nacos-all - 2.0.0-1-SNAPSHOT + 2.0.0-ALPHA2 ../pom.xml 4.0.0 diff --git a/config/pom.xml b/config/pom.xml index eb97c4013..0e346018d 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -20,7 +20,7 @@ com.alibaba.nacos nacos-all - 2.0.0-1-SNAPSHOT + 2.0.0-ALPHA2 4.0.0 diff --git a/consistency/pom.xml b/consistency/pom.xml index d96c52b46..b3308834e 100644 --- a/consistency/pom.xml +++ b/consistency/pom.xml @@ -87,7 +87,7 @@ com.alibaba.nacos nacos-all ../pom.xml - 2.0.0-1-SNAPSHOT + 2.0.0-ALPHA2 diff --git a/console/pom.xml b/console/pom.xml index 0f44d7476..a29739967 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -21,7 +21,7 @@ com.alibaba.nacos nacos-all - 2.0.0-1-SNAPSHOT + 2.0.0-ALPHA2 nacos-console jar diff --git a/core/pom.xml b/core/pom.xml index 976d5578f..308cccb45 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ com.alibaba.nacos nacos-all - 2.0.0-1-SNAPSHOT + 2.0.0-ALPHA2 ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index 6a5a6d66c..dce0c6230 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -21,7 +21,7 @@ com.alibaba.nacos nacos-all - 2.0.0-1-SNAPSHOT + 2.0.0-ALPHA2 ../pom.xml diff --git a/example/pom.xml b/example/pom.xml index 9fbadf154..a9802b7e7 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -21,7 +21,7 @@ com.alibaba.nacos nacos-all - 2.0.0-1-SNAPSHOT + 2.0.0-ALPHA2 ../pom.xml diff --git a/istio/pom.xml b/istio/pom.xml index 97714eb19..ee37be435 100644 --- a/istio/pom.xml +++ b/istio/pom.xml @@ -19,7 +19,7 @@ nacos-all com.alibaba.nacos - 2.0.0-1-SNAPSHOT + 2.0.0-ALPHA2 4.0.0 diff --git a/naming/pom.xml b/naming/pom.xml index fd2fc627d..94cf143b5 100644 --- a/naming/pom.xml +++ b/naming/pom.xml @@ -21,7 +21,7 @@ com.alibaba.nacos nacos-all - 2.0.0-1-SNAPSHOT + 2.0.0-ALPHA2 ../pom.xml diff --git a/pom.xml b/pom.xml index 2033cec67..433040652 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 2018 com.alibaba.nacos nacos-all - 2.0.0-1-SNAPSHOT + 2.0.0-ALPHA2 pom Alibaba NACOS ${project.version} @@ -36,7 +36,7 @@ git@github.com:alibaba/nacos.git scm:git@github.com:alibaba/nacos.git scm:git@github.com:alibaba/nacos.git - nacos-all-SNAPSHOT + nacos-all-2.0.0-ALPHA2 diff --git a/sys/pom.xml b/sys/pom.xml index 225c091e5..c5183a303 100644 --- a/sys/pom.xml +++ b/sys/pom.xml @@ -21,7 +21,7 @@ com.alibaba.nacos nacos-all - 2.0.0-1-SNAPSHOT + 2.0.0-ALPHA2 ../pom.xml 4.0.0 diff --git a/test/pom.xml b/test/pom.xml index a3170e8aa..dbffae62f 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -20,7 +20,7 @@ com.alibaba.nacos nacos-all - 2.0.0-1-SNAPSHOT + 2.0.0-ALPHA2 ../pom.xml 4.0.0 From 11ab95812b580969e28e127906eb8a37181033f0 Mon Sep 17 00:00:00 2001 From: KomachiSion <263976490@qq.com> Date: Thu, 14 Jan 2021 17:41:32 +0800 Subject: [PATCH 2/6] Upgrade to 2.0.0-ALPHA.2 --- address/pom.xml | 2 +- api/pom.xml | 2 +- auth/pom.xml | 2 +- client/pom.xml | 2 +- cmdb/pom.xml | 2 +- common/pom.xml | 2 +- config/pom.xml | 2 +- consistency/pom.xml | 2 +- console/pom.xml | 2 +- core/pom.xml | 2 +- distribution/pom.xml | 2 +- example/pom.xml | 2 +- istio/pom.xml | 2 +- naming/pom.xml | 2 +- pom.xml | 4 ++-- sys/pom.xml | 2 +- test/pom.xml | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/address/pom.xml b/address/pom.xml index 30bef3c09..976ca787a 100644 --- a/address/pom.xml +++ b/address/pom.xml @@ -19,7 +19,7 @@ nacos-all com.alibaba.nacos - 2.0.0-ALPHA2 + 2.0.0-ALPHA.2 4.0.0 diff --git a/api/pom.xml b/api/pom.xml index 9a93caa89..9cf4f4e0f 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -19,7 +19,7 @@ com.alibaba.nacos nacos-all - 2.0.0-ALPHA2 + 2.0.0-ALPHA.2 4.0.0 diff --git a/auth/pom.xml b/auth/pom.xml index 47f8b1792..85874c209 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -21,7 +21,7 @@ com.alibaba.nacos nacos-all - 2.0.0-ALPHA2 + 2.0.0-ALPHA.2 ../pom.xml 4.0.0 diff --git a/client/pom.xml b/client/pom.xml index 936387fa7..12ed8791c 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -19,7 +19,7 @@ com.alibaba.nacos nacos-all - 2.0.0-ALPHA2 + 2.0.0-ALPHA.2 ../pom.xml diff --git a/cmdb/pom.xml b/cmdb/pom.xml index 62adedfae..9702e2fab 100644 --- a/cmdb/pom.xml +++ b/cmdb/pom.xml @@ -21,7 +21,7 @@ nacos-all com.alibaba.nacos - 2.0.0-ALPHA2 + 2.0.0-ALPHA.2 ../pom.xml 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 4fc5ee8b2..28b639027 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -21,7 +21,7 @@ com.alibaba.nacos nacos-all - 2.0.0-ALPHA2 + 2.0.0-ALPHA.2 ../pom.xml 4.0.0 diff --git a/config/pom.xml b/config/pom.xml index 0e346018d..492bc10e1 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -20,7 +20,7 @@ com.alibaba.nacos nacos-all - 2.0.0-ALPHA2 + 2.0.0-ALPHA.2 4.0.0 diff --git a/consistency/pom.xml b/consistency/pom.xml index b3308834e..a78d250e4 100644 --- a/consistency/pom.xml +++ b/consistency/pom.xml @@ -87,7 +87,7 @@ com.alibaba.nacos nacos-all ../pom.xml - 2.0.0-ALPHA2 + 2.0.0-ALPHA.2 diff --git a/console/pom.xml b/console/pom.xml index a29739967..69c8f4650 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -21,7 +21,7 @@ com.alibaba.nacos nacos-all - 2.0.0-ALPHA2 + 2.0.0-ALPHA.2 nacos-console jar diff --git a/core/pom.xml b/core/pom.xml index 308cccb45..affe76a42 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ com.alibaba.nacos nacos-all - 2.0.0-ALPHA2 + 2.0.0-ALPHA.2 ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index dce0c6230..7d21c0431 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -21,7 +21,7 @@ com.alibaba.nacos nacos-all - 2.0.0-ALPHA2 + 2.0.0-ALPHA.2 ../pom.xml diff --git a/example/pom.xml b/example/pom.xml index a9802b7e7..d1d001768 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -21,7 +21,7 @@ com.alibaba.nacos nacos-all - 2.0.0-ALPHA2 + 2.0.0-ALPHA.2 ../pom.xml diff --git a/istio/pom.xml b/istio/pom.xml index ee37be435..eba59a173 100644 --- a/istio/pom.xml +++ b/istio/pom.xml @@ -19,7 +19,7 @@ nacos-all com.alibaba.nacos - 2.0.0-ALPHA2 + 2.0.0-ALPHA.2 4.0.0 diff --git a/naming/pom.xml b/naming/pom.xml index 94cf143b5..722ba45b6 100644 --- a/naming/pom.xml +++ b/naming/pom.xml @@ -21,7 +21,7 @@ com.alibaba.nacos nacos-all - 2.0.0-ALPHA2 + 2.0.0-ALPHA.2 ../pom.xml diff --git a/pom.xml b/pom.xml index 433040652..bea6c1a6e 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 2018 com.alibaba.nacos nacos-all - 2.0.0-ALPHA2 + 2.0.0-ALPHA.2 pom Alibaba NACOS ${project.version} @@ -36,7 +36,7 @@ git@github.com:alibaba/nacos.git scm:git@github.com:alibaba/nacos.git scm:git@github.com:alibaba/nacos.git - nacos-all-2.0.0-ALPHA2 + nacos-all-2.0.0-ALPHA.2 diff --git a/sys/pom.xml b/sys/pom.xml index c5183a303..a25112324 100644 --- a/sys/pom.xml +++ b/sys/pom.xml @@ -21,7 +21,7 @@ com.alibaba.nacos nacos-all - 2.0.0-ALPHA2 + 2.0.0-ALPHA.2 ../pom.xml 4.0.0 diff --git a/test/pom.xml b/test/pom.xml index dbffae62f..e9e409769 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -20,7 +20,7 @@ com.alibaba.nacos nacos-all - 2.0.0-ALPHA2 + 2.0.0-ALPHA.2 ../pom.xml 4.0.0 From 84239f0d15366b5ab82b0e96ff49835b61034753 Mon Sep 17 00:00:00 2001 From: KomachiSion <263976490@qq.com> Date: Fri, 5 Feb 2021 17:08:05 +0800 Subject: [PATCH 3/6] Upgrade to 2.0.0-BETA --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 63d799e03..b07c44a54 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ - 2.0.0-1-SNAPSHOT + 2.0.0-BETA UTF-8 UTF-8 From 580f73e4f359da8bf8b96e951ed8928036ef6fe7 Mon Sep 17 00:00:00 2001 From: KomachiSion <263976490@qq.com> Date: Fri, 19 Mar 2021 15:53:10 +0800 Subject: [PATCH 4/6] Upgrade to 2.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 07bae25d8..e39a8fca3 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ - 2.0.0-BETA + 2.0.0 UTF-8 UTF-8 From 4c499794c416654bdc4f1870587da9bb9b53b99e Mon Sep 17 00:00:00 2001 From: Jisfeng Date: Thu, 8 Apr 2021 16:08:35 +0800 Subject: [PATCH 5/6] fix subscriber app unknown (#5274) --- .../remote/rpc/handler/SubscribeServiceRequestHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/naming/src/main/java/com/alibaba/nacos/naming/remote/rpc/handler/SubscribeServiceRequestHandler.java b/naming/src/main/java/com/alibaba/nacos/naming/remote/rpc/handler/SubscribeServiceRequestHandler.java index 9822199f9..36baba5b9 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/remote/rpc/handler/SubscribeServiceRequestHandler.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/remote/rpc/handler/SubscribeServiceRequestHandler.java @@ -66,9 +66,10 @@ public class SubscribeServiceRequestHandler extends RequestHandler Date: Thu, 8 Apr 2021 16:10:01 +0800 Subject: [PATCH 6/6] Revert "fix subscriber app unknown (#5274)" (#5305) This reverts commit 4c499794c416654bdc4f1870587da9bb9b53b99e. --- .../remote/rpc/handler/SubscribeServiceRequestHandler.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/naming/src/main/java/com/alibaba/nacos/naming/remote/rpc/handler/SubscribeServiceRequestHandler.java b/naming/src/main/java/com/alibaba/nacos/naming/remote/rpc/handler/SubscribeServiceRequestHandler.java index 36baba5b9..9822199f9 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/remote/rpc/handler/SubscribeServiceRequestHandler.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/remote/rpc/handler/SubscribeServiceRequestHandler.java @@ -66,10 +66,9 @@ public class SubscribeServiceRequestHandler extends RequestHandler