From 4ca2263e099a474a561758b94d4200507eb60a2c Mon Sep 17 00:00:00 2001
From: zb881010 <zhangbin1010@qq.com>
Date: Thu, 18 Jul 2024 16:28:54 +0800
Subject: [PATCH 1/2] upgrade spring cloud to 2023.0.3

---
 pom.xml                                            | 14 +++++---------
 spring-cloud-alibaba-dependencies/pom.xml          |  2 +-
 spring-cloud-alibaba-tests/nacos-tests/pom.xml     |  2 +-
 .../spring-cloud-alibaba-test-support/pom.xml      |  8 ++++----
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 72fadb6e57..d0caa59cce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-build</artifactId>
-        <version>4.1.0</version>
+        <version>4.1.3</version>
         <relativePath/>
     </parent>
 
@@ -80,17 +80,13 @@
 
     <properties>
         <!-- Project revision -->
-        <revision>2023.0.1.2</revision>
+        <revision>2023.0.3.0</revision>
 
         <!-- Spring Cloud -->
-        <spring.cloud.version>2023.0.1</spring.cloud.version>
+        <spring.cloud.version>2023.0.3</spring.cloud.version>
 
         <!-- Spring Boot -->
-        <spring-boot.version>3.2.4</spring-boot.version>
-
-        <curator.version>4.0.1</curator.version>
-
-
+        <spring-boot.version>3.2.7</spring-boot.version>
 
         <!-- Maven Plugin Versions -->
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
@@ -103,7 +99,7 @@
         <flatten-maven-plugin.version>1.2.7</flatten-maven-plugin.version>
         <gmavenplus-plugin.version>1.6</gmavenplus-plugin.version>
         <jacoco.version>0.8.8</jacoco.version>
-        <native-maven-plugin.version>0.9.19</native-maven-plugin.version>
+        <native-maven-plugin.version>0.10.2</native-maven-plugin.version>
     </properties>
 
     <modules>
diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml
index c12f285e39..a9714a41a6 100644
--- a/spring-cloud-alibaba-dependencies/pom.xml
+++ b/spring-cloud-alibaba-dependencies/pom.xml
@@ -18,7 +18,7 @@
     <description>Spring Cloud Alibaba Dependencies</description>
 
     <properties>
-        <revision>2023.0.1.2</revision>
+        <revision>2023.0.3.0</revision>
         <sentinel.version>1.8.8</sentinel.version>
         <nacos.client.version>2.3.2</nacos.client.version>
         <seata.version>2.0.0</seata.version>
diff --git a/spring-cloud-alibaba-tests/nacos-tests/pom.xml b/spring-cloud-alibaba-tests/nacos-tests/pom.xml
index c2b8551aa2..1c8803c0ce 100644
--- a/spring-cloud-alibaba-tests/nacos-tests/pom.xml
+++ b/spring-cloud-alibaba-tests/nacos-tests/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-bootstrap</artifactId>
-            <version>3.1.1</version>
+            <version>4.1.4</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/spring-cloud-alibaba-tests/spring-cloud-alibaba-test-support/pom.xml b/spring-cloud-alibaba-tests/spring-cloud-alibaba-test-support/pom.xml
index 83000178da..bb68e76660 100644
--- a/spring-cloud-alibaba-tests/spring-cloud-alibaba-test-support/pom.xml
+++ b/spring-cloud-alibaba-tests/spring-cloud-alibaba-test-support/pom.xml
@@ -17,14 +17,14 @@
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <junit.version>5.7.2</junit.version>
+        <junit.version>5.10.2</junit.version>
         <selenium.version>3.141.59</selenium.version>
         <lombok.version>1.18.30</lombok.version>
         <assertj-core.version>3.20.2</assertj-core.version>
         <awaitility.version>4.1.0</awaitility.version>
-        <kotlin.version>1.5.30</kotlin.version>
-        <slf4j-api.version>1.7.32</slf4j-api.version>
-        <log4j-slf4j-impl.version>2.14.1</log4j-slf4j-impl.version>
+        <kotlin.version>1.9.24</kotlin.version>
+        <slf4j-api.version>2.0.13</slf4j-api.version>
+        <log4j-slf4j-impl.version>2.23.1</log4j-slf4j-impl.version>
         <guava.version>31.1-jre</guava.version>
         <hamcrest.version>1.3</hamcrest.version>
     </properties>

From 8e09ae3fab3bb6ac0c9e1815c3d1e045a0bd16e6 Mon Sep 17 00:00:00 2001
From: zb881010 <zhangbin1010@qq.com>
Date: Fri, 19 Jul 2024 15:36:32 +0800
Subject: [PATCH 2/2] revert project version

---
 pom.xml                                   | 2 +-
 spring-cloud-alibaba-dependencies/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d0caa59cce..6fc392b594 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
 
     <properties>
         <!-- Project revision -->
-        <revision>2023.0.3.0</revision>
+        <revision>2023.0.1.2</revision>
 
         <!-- Spring Cloud -->
         <spring.cloud.version>2023.0.3</spring.cloud.version>
diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml
index a9714a41a6..c12f285e39 100644
--- a/spring-cloud-alibaba-dependencies/pom.xml
+++ b/spring-cloud-alibaba-dependencies/pom.xml
@@ -18,7 +18,7 @@
     <description>Spring Cloud Alibaba Dependencies</description>
 
     <properties>
-        <revision>2023.0.3.0</revision>
+        <revision>2023.0.1.2</revision>
         <sentinel.version>1.8.8</sentinel.version>
         <nacos.client.version>2.3.2</nacos.client.version>
         <seata.version>2.0.0</seata.version>