From 7fb5710cb359d5ea9894e84a0511d90426eaa131 Mon Sep 17 00:00:00 2001
From: v-zhangjc9 <v-zhangjc9.gd@chinatelecom.cn>
Date: Thu, 9 May 2024 11:05:10 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E5=8D=87=E7=BA=A7=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

spring cloud升级到2.x的最后一个小版本，其余依赖配合升级
---
 pom.xml                                       | 26 ++++++++++++-------
 service-check/pom.xml                         |  2 --
 .../service-executor-manager/pom.xml          |  2 --
 .../service-executor-task/pom.xml             |  1 -
 service-forest/pom.xml                        |  1 -
 service-hudi-query/pom.xml                    |  2 --
 service-launcher/pom.xml                      |  1 -
 utils/executor/pom.xml                        |  1 -
 utils/sync/pom.xml                            |  1 -
 9 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index e38fee2..2df2773 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,17 +45,17 @@
 
         <build-tag>b2b12</build-tag>
 
-        <spring-boot.version>2.6.8</spring-boot.version>
-        <spring-cloud.version>2021.0.3</spring-cloud.version>
+        <spring-boot.version>2.6.15</spring-boot.version>
+        <spring-cloud.version>2021.0.9</spring-cloud.version>
         <flink.major.version>1.13</flink.major.version>
         <scala.major.version>2.11</scala.major.version>
         <hudi.version>0.12.0-eshore-SNAPSHOT</hudi.version>
         <flink.version>1.13.3</flink.version>
         <hadoop.version>1.13.3</hadoop.version>
-        <eclipse-collections.version>10.4.0</eclipse-collections.version>
+        <eclipse-collections.version>11.1.0</eclipse-collections.version>
         <curator.version>5.1.0</curator.version>
         <pulsar.version>2.8.0</pulsar.version>
-        <hutool.version>5.7.16</hutool.version>
+        <hutool.version>5.8.27</hutool.version>
     </properties>
 
     <profiles>
@@ -142,22 +142,22 @@
             <dependency>
                 <groupId>com.dtflys.forest</groupId>
                 <artifactId>forest-spring-boot-starter</artifactId>
-                <version>1.5.30</version>
+                <version>1.5.36</version>
             </dependency>
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>druid-spring-boot-starter</artifactId>
-                <version>1.2.17</version>
+                <version>1.2.22</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
                 <artifactId>jackson-datatype-eclipse-collections</artifactId>
-                <version>2.13.5</version>
+                <version>2.17.1</version>
             </dependency>
             <dependency>
                 <groupId>com.github.ulisesbocchio</groupId>
                 <artifactId>jasypt-spring-boot-starter</artifactId>
-                <version>3.0.4</version>
+                <version>3.0.5</version>
             </dependency>
 
             <!-- 命令行工具 -->
@@ -198,7 +198,7 @@
             <dependency>
                 <groupId>dev.failsafe</groupId>
                 <artifactId>failsafe</artifactId>
-                <version>3.2.4</version>
+                <version>3.3.1</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.collections</groupId>
@@ -244,7 +244,7 @@
             <dependency>
                 <groupId>com.cronutils</groupId>
                 <artifactId>cron-utils</artifactId>
-                <version>9.2.0</version>
+                <version>9.2.1</version>
             </dependency>
             <dependency>
                 <groupId>com.sun.jersey</groupId>
@@ -383,6 +383,12 @@
                 <artifactId>curator-framework</artifactId>
                 <version>${curator.version}</version>
             </dependency>
+            <!-- 测试 -->
+            <dependency>
+                <groupId>io.javalin</groupId>
+                <artifactId>javalin</artifactId>
+                <version>4.6.8</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/service-check/pom.xml b/service-check/pom.xml
index 2baae15..88f1a5b 100644
--- a/service-check/pom.xml
+++ b/service-check/pom.xml
@@ -81,7 +81,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <id>copy-config-file</id>
@@ -106,7 +105,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
diff --git a/service-executor/service-executor-manager/pom.xml b/service-executor/service-executor-manager/pom.xml
index 96579c9..5e0b6c6 100644
--- a/service-executor/service-executor-manager/pom.xml
+++ b/service-executor/service-executor-manager/pom.xml
@@ -100,7 +100,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <id>copy-config-file</id>
@@ -125,7 +124,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
diff --git a/service-executor/service-executor-task/pom.xml b/service-executor/service-executor-task/pom.xml
index 434b42f..8b12f51 100644
--- a/service-executor/service-executor-task/pom.xml
+++ b/service-executor/service-executor-task/pom.xml
@@ -84,7 +84,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
diff --git a/service-forest/pom.xml b/service-forest/pom.xml
index c7a22bf..ab62bf8 100644
--- a/service-forest/pom.xml
+++ b/service-forest/pom.xml
@@ -31,7 +31,6 @@
         <dependency>
             <groupId>io.javalin</groupId>
             <artifactId>javalin</artifactId>
-            <version>4.6.8</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/service-hudi-query/pom.xml b/service-hudi-query/pom.xml
index 557db5b..480ca9b 100644
--- a/service-hudi-query/pom.xml
+++ b/service-hudi-query/pom.xml
@@ -97,7 +97,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <id>copy-config-file</id>
@@ -122,7 +121,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
diff --git a/service-launcher/pom.xml b/service-launcher/pom.xml
index 962a8a5..7d8f100 100644
--- a/service-launcher/pom.xml
+++ b/service-launcher/pom.xml
@@ -78,7 +78,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <id>copy-config-file</id>
diff --git a/utils/executor/pom.xml b/utils/executor/pom.xml
index 05bfe6b..88e2430 100644
--- a/utils/executor/pom.xml
+++ b/utils/executor/pom.xml
@@ -111,7 +111,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
diff --git a/utils/sync/pom.xml b/utils/sync/pom.xml
index 459bf58..619a6ac 100644
--- a/utils/sync/pom.xml
+++ b/utils/sync/pom.xml
@@ -19,7 +19,6 @@
         <dependency>
             <groupId>com.lanyuanxiaoyao</groupId>
             <artifactId>service-common</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.hudi</groupId>