From e04e4a2737e86bc646b967e40ad7de8c75fa62bd Mon Sep 17 00:00:00 2001 From: LegGasai <1642271413@qq.com> Date: Mon, 16 Sep 2024 21:50:25 +0800 Subject: [PATCH 1/2] fix: duplicated dependency --- dependencies/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 42df7870a0d..4bf0450d4f3 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -872,10 +872,6 @@ spring-webmvc ${spring-webmvc.version} - - org.apache.tomcat.embed - tomcat-embed-core - From aed194b244fe2cf68cdc17077ea3ae9154ac01c6 Mon Sep 17 00:00:00 2001 From: LegGasai <1642271413@qq.com> Date: Mon, 16 Sep 2024 21:54:07 +0800 Subject: [PATCH 2/2] changes --- changes/en-us/2.x.md | 1 + changes/zh-cn/2.x.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md index 1471b2bb436..4ad92ff7774 100644 --- a/changes/en-us/2.x.md +++ b/changes/en-us/2.x.md @@ -46,6 +46,7 @@ Add changes here for all PR submitted to the 2.x branch. - [[#6843](https://github.com/apache/incubator-seata/pull/6843)] Fix 403 error when sending a POST request from the console - [[#6850](https://github.com/apache/incubator-seata/pull/6850)] raft mode is backward compatible with version 2.0 - [[#6855](https://github.com/apache/incubator-seata/pull/6855)] after scaling down a Raft cluster, the metadata still contains the removed node +- [[#6859](https://github.com/apache/incubator-seata/pull/6859)] remove duplicated dependency in pom ### optimize: diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md index 8370ce8a46a..a6e967a0b0b 100644 --- a/changes/zh-cn/2.x.md +++ b/changes/zh-cn/2.x.md @@ -47,7 +47,7 @@ - [[#6843](https://github.com/apache/incubator-seata/pull/6843)] 修复从控制台发送POST请求时出现的403错误 - [[#6850](https://github.com/apache/incubator-seata/pull/6850)] raft模式向下兼容2.0版本 - [[#6855](https://github.com/apache/incubator-seata/pull/6855)] 修复raft缩容后元数据中残留该节点的问题(需先升级到2.2再进行缩容) - +- [[#6859](https://github.com/apache/incubator-seata/pull/6859)] 移除重复的依赖 ### optimize: - [[#6499](https://github.com/apache/incubator-seata/pull/6499)] 拆分 committing 和 rollbacking 状态的任务线程池