security: upgrade seata-server spring version (apache#6013)

ptyin · Nov 11, 2023 · bc7d212 · bc7d212
1 parent 8192138
commit bc7d212
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/changes/en-us/2.0.0.md b/changes/en-us/2.0.0.md
@@ -158,6 +158,7 @@ The version is updated as follows:
 - [[#5916](https://github.com/seata/seata/pull/5916)] upgrade nodejs dependency
 - [[#5942](https://github.com/seata/seata/pull/5942)] upgrade dependencies version
 - [[#5987](https://github.com/seata/seata/pull/5987)] upgrade some dependencies version
+- [[#6013](https://github.com/seata/seata/pull/6013)] upgrade seata-server spring version
 
 ### test:
 - [[#5308](https://github.com/seata/seata/pull/5308)] add unit test [FileLoader, ObjectHolder, StringUtils]

diff --git a/changes/zh-cn/2.0.0.md b/changes/zh-cn/2.0.0.md
@@ -159,6 +159,7 @@ Seata 是一款开源的分布式事务解决方案，提供高性能和简单
 - [[#5916](https://github.com/seata/seata/pull/5916)] 修复npm package漏洞
 - [[#5942](https://github.com/seata/seata/pull/5942)] 升级依赖版本
 - [[#5987](https://github.com/seata/seata/pull/5987)] 升级依赖版本
+- [[#6013](https://github.com/seata/seata/pull/6013)] 升级seata-server依赖的spring版本
 
 ### test：
 - [[#5308](https://github.com/seata/seata/pull/5308)] 添加单元测试用例 [FileLoader, ObjectHolder, StringUtils]

diff --git a/console/pom.xml b/console/pom.xml
@@ -29,8 +29,9 @@
     <description>console for Seata built with Maven</description>
 
     <properties>
-        <spring-boot-for-server.version>${spring-boot.version}</spring-boot-for-server.version>
-        <spring-framework-for-server.version>${spring-framework.version}</spring-framework-for-server.version>
+        <spring-boot-for-server.version>2.7.17</spring-boot-for-server.version>
+        <spring-framework-for-server.version>5.3.30</spring-framework-for-server.version>
+        <snakeyaml-for-server.version>2.0</snakeyaml-for-server.version>
     </properties>
 
     <dependencyManagement>
@@ -63,10 +64,19 @@
                         <groupId>org.springframework</groupId>
                         <artifactId>spring-framework-bom</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.yaml</groupId>
+                        <artifactId>snakeyaml</artifactId>
+                    </exclusion>
                 </exclusions>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>${snakeyaml-for-server.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/server/pom.xml b/server/pom.xml
@@ -29,8 +29,9 @@
     <description>server for Seata built with Maven</description>
 
     <properties>
-        <spring-boot-for-server.version>${spring-boot.version}</spring-boot-for-server.version>
-        <spring-framework-for-server.version>${spring-framework.version}</spring-framework-for-server.version>
+        <spring-boot-for-server.version>2.7.17</spring-boot-for-server.version>
+        <spring-framework-for-server.version>5.3.30</spring-framework-for-server.version>
+        <snakeyaml-for-server.version>2.0</snakeyaml-for-server.version>
     </properties>
 
     <dependencyManagement>
@@ -63,10 +64,19 @@
                         <groupId>org.springframework</groupId>
                         <artifactId>spring-framework-bom</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.yaml</groupId>
+                        <artifactId>snakeyaml</artifactId>
+                    </exclusion>
                 </exclusions>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>${snakeyaml-for-server.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>