optimize: upgrade and tidy some depenencies (#6340)

apache · Feb 15, 2024 · 3e36de2 · 3e36de2
1 parent 84c9f35
commit 3e36de2
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 28 deletions.
diff --git a/build/pom.xml b/build/pom.xml
@@ -79,6 +79,11 @@
         <spring-boot.version>2.5.13</spring-boot.version>
         <spring-framework.version>5.3.20</spring-framework.version>
 
+        <!--  server side dependency-->
+        <kafka-appender.version>0.2.0-RC2</kafka-appender.version>
+        <kafka-clients.version>3.6.1</kafka-clients.version>
+        <snakeyaml.version>2.0</snakeyaml.version>
+
         <!-- For test -->
         <junit-jupiter.version>5.8.2</junit-jupiter.version>
         <junit-platform.version>1.8.2</junit-platform.version>

diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
@@ -93,6 +93,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6145](https://github.com/apache/incubator-seata/pull/6145)] upgrade jettison to 1.5.4
 - [[#6144](https://github.com/apache/incubator-seata/pull/6144)] upgrade nacos client to 1.4.6
 - [[#6147](https://github.com/apache/incubator-seata/pull/6147)] upgrade kafka-clients to 3.6.1
+- [[#6340](https://github.com/apache/incubator-seata/pull/6340)] upgrade and tidy some dependencies
 
 ### test:
 - [[#6081](https://github.com/apache/incubator-seata/pull/6081)] add `test-os.yml` for testing the OS

diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
@@ -93,6 +93,7 @@
 - [[#6144](https://github.com/apache/incubator-seata/pull/6144)] 升级Nacos依赖版本至1.4.6
 - [[#6145](https://github.com/apache/incubator-seata/pull/6145)] 升级 jettison依赖版本至1.5.4
 - [[#6147](https://github.com/apache/incubator-seata/pull/6147)] 升级 kafka-clients依赖至3.6.1
+- [[#6340](https://github.com/apache/incubator-seata/pull/6340)] 升级和整理依赖
 
 ### test:
 - [[#6081](https://github.com/apache/incubator-seata/pull/6081)] 添加 `test-os.yml` 用于测试seata在各种操作系统下的运行情况

diff --git a/console/pom.xml b/console/pom.xml
@@ -34,7 +34,6 @@
     <properties>
         <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>
@@ -67,19 +66,10 @@
                         <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>
 
@@ -97,6 +87,17 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>snakeyaml</artifactId>
+                    <groupId>org.yaml</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>${snakeyaml.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -49,7 +49,7 @@
         <commons-lang.version>2.6</commons-lang.version>
         <aopalliance.version>1.0</aopalliance.version>
         <zkclient.version>0.11</zkclient.version>
-        <apache-zookeeper.version>3.5.9</apache-zookeeper.version>
+        <apache-zookeeper.version>3.7.2</apache-zookeeper.version>
         <curator-test.version>5.1.0</curator-test.version>
         <spring-context-support.version>1.0.2</spring-context-support.version>
         <mock-jedis.version>0.3.1</mock-jedis.version>
@@ -73,8 +73,7 @@
         <ant.version>1.10.12</ant.version>
         <lz4.version>1.7.1</lz4.version>
         <jraft.version>1.3.14</jraft.version>
-        <netty.version>4.1.86.Final</netty.version>
-        <snakeyaml.version>2.0</snakeyaml.version>
+        <netty.version>4.1.94.Final</netty.version>
         <sofa.hessian.version>4.0.3</sofa.hessian.version>
 
         <protobuf.version>3.16.3</protobuf.version>
@@ -92,10 +91,8 @@
 
         <jwt.version>0.10.5</jwt.version>
         <prometheus.client.version>0.6.0</prometheus.client.version>
-        <logback.version>1.2.9</logback.version>
+        <logback.version>1.3.14</logback.version>
         <logstash-logback-encoder.version>6.5</logstash-logback-encoder.version>
-        <kafka-appender.version>0.2.0-RC2</kafka-appender.version>
-        <kafka-clients.version>3.6.1</kafka-clients.version>
 
         <!-- redis -->
         <jedis.version>3.8.0</jedis.version>
@@ -105,7 +102,7 @@
         <mysql.version>5.1.42</mysql.version>
         <ojdbc.version>19.3.0.0</ojdbc.version>
         <dm.version>8.1.2.192</dm.version>
-        <postgresql.version>42.3.3</postgresql.version>
+        <postgresql.version>42.3.8</postgresql.version>
         <h2.version>1.4.181</h2.version>
         <mariadb.version>2.7.2</mariadb.version>
         <!-- db connection pool -->
@@ -334,7 +331,7 @@
                 <exclusions>
                     <exclusion>
                         <groupId>io.netty</groupId>
-                        <artifactId>netty</artifactId>
+                        <artifactId>*</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>

diff --git a/server/pom.xml b/server/pom.xml
@@ -34,7 +34,6 @@
     <properties>
         <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>
@@ -67,19 +66,10 @@
                         <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>
 
@@ -93,8 +83,17 @@
                     <artifactId>log4j-to-slf4j</artifactId>
                     <groupId>org.apache.logging.log4j</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>snakeyaml</artifactId>
+                    <groupId>org.yaml</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>${snakeyaml.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -248,6 +247,7 @@
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
+            <version>${kafka-clients.version}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>