diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md index 789242cb85d..84612c10809 100644 --- a/changes/en-us/2.x.md +++ b/changes/en-us/2.x.md @@ -58,6 +58,7 @@ Add changes here for all PR submitted to the 2.x branch. - [[#7027](https://github.com/apache/incubator-seata/pull/7027)] raft mode maintains the reload logic consistent with the file - [[#6891](https://github.com/apache/incubator-seata/pull/6891)] add StateType Enum - [[#7040](https://github.com/apache/incubator-seata/pull/7040)] optimize the print info in ConfigurationFactory +- [[#7046](https://github.com/apache/incubator-seata/pull/7046)] remove the dependency conflict for spring-webmvc ### refactor: - [[#7017](https://github.com/apache/incubator-seata/pull/7017)] remove dependency on seata-server module diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md index abaa8d4fd93..fd0e5ddc0c5 100644 --- a/changes/zh-cn/2.x.md +++ b/changes/zh-cn/2.x.md @@ -61,6 +61,7 @@ - [[#7027](https://github.com/apache/incubator-seata/pull/7027)] raft模式下reload行为与file保持一致 - [[#6891](https://github.com/apache/incubator-seata/pull/6891)] 增加 StateType 类型 - [[#7040](https://github.com/apache/incubator-seata/pull/7040)] 优化ConfigurationFactory加载的打印信息 +- [[#7046](https://github.com/apache/incubator-seata/pull/7046)] 去除spring-webmvc的依赖冲突 ### refactor: - [[#7017](https://github.com/apache/incubator-seata/pull/7017)] 移除 seata-server 模块的依赖 diff --git a/dependencies/pom.xml b/dependencies/pom.xml index cd83dac7f9d..a4275c8c146 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -127,7 +127,6 @@ 1.7.3 - 5.3.26 9.0.90 @@ -880,12 +879,6 @@ ${rocketmq-version} - - - org.springframework - spring-webmvc - ${spring-webmvc.version} -