From 2ed48c55068041fe383766b52486811acd7ff6f1 Mon Sep 17 00:00:00 2001
From: theonefx <chenxilzx1@gmail.com>
Date: Thu, 26 Mar 2020 16:18:03 +0800
Subject: [PATCH 1/4] fix issue:
 https://github.com/alibaba/spring-cloud-alibaba/issues/1288

---
 .../pom.xml                                          |  4 ++++
 .../pom.xml                                          | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-sidecar-examples/spring-cloud-alibaba-sidecar-consul-example/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-sidecar-examples/spring-cloud-alibaba-sidecar-consul-example/pom.xml
index 07124facaf..be092e0d8d 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-sidecar-examples/spring-cloud-alibaba-sidecar-consul-example/pom.xml
+++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-sidecar-examples/spring-cloud-alibaba-sidecar-consul-example/pom.xml
@@ -32,6 +32,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-sidecar-examples/spring-cloud-alibaba-sidecar-nacos-example/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-sidecar-examples/spring-cloud-alibaba-sidecar-nacos-example/pom.xml
index b7eb3376e4..3aa59a76a3 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-sidecar-examples/spring-cloud-alibaba-sidecar-nacos-example/pom.xml
+++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-sidecar-examples/spring-cloud-alibaba-sidecar-nacos-example/pom.xml
@@ -18,11 +18,23 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sidecar</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-core</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

From 56ac7f1a3a7876f0b4cef544c8511421a9d76fb6 Mon Sep 17 00:00:00 2001
From: theonefx <chenxilzx1@gmail.com>
Date: Thu, 26 Mar 2020 17:26:56 +0800
Subject: [PATCH 2/4] fix compatibility problem between
 spring-boot-starter-webflux:2.2.4.RELEASE and
 spring-cloud-gateway-core:2.2.2.RELEASE

---
 pom.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pom.xml b/pom.xml
index bd659bfbf5..2736b9c234 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,6 +253,24 @@
                 <artifactId>rocketmq-spring-boot-starter</artifactId>
                 <version>${rocketmq.starter.version}</version>
             </dependency>
+
+            <!--
+                TODO:
+                check it every times, whern spring-boot-starter-webflux:2.2.4.RELEASE or spring-cloud-gateway-core:2.2.2.RELEASE has bean upgrade
+                due to spring-cloud-build:2.2.2.RELEASE has not support spring-cloud-gateway-dependencies:2.2.2.RELEASE very well
+                it cource some compatibility problem between ReactorNettyWebSocketClient and GatewayAutoConfiguration
+            -->
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-web</artifactId>
+                <version>5.2.4.RELEASE</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-webflux</artifactId>
+                <version>5.2.4.RELEASE</version>
+                <scope>compile</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

From a6a6b623a32458f5b8404668ca5bf51b3b3bcd8c Mon Sep 17 00:00:00 2001
From: theonefx <chenxilzx1@gmail.com>
Date: Fri, 27 Mar 2020 10:59:02 +0800
Subject: [PATCH 3/4] update spring cloud build version to 2.2.3.RELEASE

---
 pom.xml | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2736b9c234..2f5e411db6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-build</artifactId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.2.3.RELEASE</version>
         <relativePath/>
     </parent>
 
@@ -253,24 +253,6 @@
                 <artifactId>rocketmq-spring-boot-starter</artifactId>
                 <version>${rocketmq.starter.version}</version>
             </dependency>
-
-            <!--
-                TODO:
-                check it every times, whern spring-boot-starter-webflux:2.2.4.RELEASE or spring-cloud-gateway-core:2.2.2.RELEASE has bean upgrade
-                due to spring-cloud-build:2.2.2.RELEASE has not support spring-cloud-gateway-dependencies:2.2.2.RELEASE very well
-                it cource some compatibility problem between ReactorNettyWebSocketClient and GatewayAutoConfiguration
-            -->
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-web</artifactId>
-                <version>5.2.4.RELEASE</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-webflux</artifactId>
-                <version>5.2.4.RELEASE</version>
-                <scope>compile</scope>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

From a0a6759eb69a695565e014049a7e4b0b9ef69ef8 Mon Sep 17 00:00:00 2001
From: theonefx <chenxilzx1@gmail.com>
Date: Fri, 27 Mar 2020 16:08:05 +0800
Subject: [PATCH 4/4] update nacos-client version to 1.2.1

---
 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 7f28bdf226..5c2b55ed88 100644
--- a/spring-cloud-alibaba-dependencies/pom.xml
+++ b/spring-cloud-alibaba-dependencies/pom.xml
@@ -21,7 +21,7 @@
         <sentinel.version>1.7.1</sentinel.version>
         <oss.version>3.1.0</oss.version>
         <seata.version>1.1.0</seata.version>
-        <nacos.client.version>1.2.0</nacos.client.version>
+        <nacos.client.version>1.2.1</nacos.client.version>
         <nacos.config.version>0.8.0</nacos.config.version>
         <acm.version>1.0.9</acm.version>
         <ans.version>1.0.1</ans.version>