From 0bc52326baced6692534bd93fe9c2c700a088aff Mon Sep 17 00:00:00 2001 From: slievrly Date: Tue, 13 Aug 2024 01:00:44 +0800 Subject: [PATCH 1/3] optimize: optimize compatible dependencies --- changes/en-us/2.x.md | 1 + changes/zh-cn/2.x.md | 1 + compatible/pom.xml | 45 +++++--------------------------------------- 3 files changed, 7 insertions(+), 40 deletions(-) diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md index ec63bdbb8d9..53722ecf46a 100644 --- a/changes/en-us/2.x.md +++ b/changes/en-us/2.x.md @@ -49,6 +49,7 @@ Add changes here for all PR submitted to the 2.x branch. - [[#6741](https://github.com/apache/incubator-seata/pull/6741)] upgrade tomcat-embed-core to 9.0.90 - [[#6742](https://github.com/apache/incubator-seata/pull/6742)] upgrade npmjs version in console - [[#6743](https://github.com/apache/incubator-seata/pull/6743)] upgrade npmjs version in saga +- [[#6746](https://github.com/apache/incubator-seata/pull/6746)] optimize compatible dependencies ### refactor: diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md index b3b64767bdd..aba94e47b05 100644 --- a/changes/zh-cn/2.x.md +++ b/changes/zh-cn/2.x.md @@ -50,6 +50,7 @@ - [[#6742](https://github.com/apache/incubator-seata/pull/6742)] 升级 console 模块 npmjs 版本 - [[#6732](https://github.com/apache/incubator-seata/pull/6732)] 为application.example.yml与application.raft.example.yml添加默认安全配置 - [[#6743](https://github.com/apache/incubator-seata/pull/6743)] 升级saga模块npmjs版本 +- [[#6746](https://github.com/apache/incubator-seata/pull/6746)] y优化 compatible 模块依赖 ### refactor: diff --git a/compatible/pom.xml b/compatible/pom.xml index 765196af880..f8cd28eb055 100644 --- a/compatible/pom.xml +++ b/compatible/pom.xml @@ -32,11 +32,6 @@ seata-all ${project.version} compatible with io.seata API - 4.11.0 - 1.2.20 - 5.1.42 - 2.7.2 - 3.12.2 true @@ -95,10 +90,14 @@ seata-rm-datasource ${project.version} + + org.apache.seata + seata-tcc + ${project.version} + org.apache.httpcomponents httpclient - 4.5.13 provided @@ -110,48 +109,17 @@ spring-expression - 5.3.26 provided io.grpc grpc-stub - 1.27.1 provided - - org.junit.jupiter - junit-jupiter-api - 5.8.2 - test - - - org.apache.seata - seata-tcc - ${project.version} - com.alibaba druid provided - ${druid.version} - - - org.mockito - mockito-core - ${mockito.version} - test - - - org.mockito - mockito-inline - ${mockito.version} - - - org.assertj - assertj-core - ${assertj-core.version} - test mysql @@ -162,13 +130,11 @@ org.mariadb.jdbc mariadb-java-client - ${mariadb.version} test com.h2database h2 - 1.4.200 test @@ -178,7 +144,6 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 true From 304e3ab01572b42b83cae6c9240a77e8d197a2c0 Mon Sep 17 00:00:00 2001 From: slievrly Date: Tue, 13 Aug 2024 01:12:15 +0800 Subject: [PATCH 2/3] update --- compatible/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/compatible/pom.xml b/compatible/pom.xml index f8cd28eb055..b8e1d7e7aee 100644 --- a/compatible/pom.xml +++ b/compatible/pom.xml @@ -124,7 +124,6 @@ mysql mysql-connector-java - ${mysql.version} test From 313af6be289d99cb5c601740f2326ddf6a001110 Mon Sep 17 00:00:00 2001 From: funkye <364176773@qq.com> Date: Tue, 13 Aug 2024 10:06:03 +0800 Subject: [PATCH 3/3] Update changes/zh-cn/2.x.md --- changes/zh-cn/2.x.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md index aba94e47b05..acc59d695a2 100644 --- a/changes/zh-cn/2.x.md +++ b/changes/zh-cn/2.x.md @@ -50,7 +50,7 @@ - [[#6742](https://github.com/apache/incubator-seata/pull/6742)] 升级 console 模块 npmjs 版本 - [[#6732](https://github.com/apache/incubator-seata/pull/6732)] 为application.example.yml与application.raft.example.yml添加默认安全配置 - [[#6743](https://github.com/apache/incubator-seata/pull/6743)] 升级saga模块npmjs版本 -- [[#6746](https://github.com/apache/incubator-seata/pull/6746)] y优化 compatible 模块依赖 +- [[#6746](https://github.com/apache/incubator-seata/pull/6746)] 优化 compatible 模块依赖 ### refactor: