This is an automated email from the ASF dual-hosted git repository.
xingfudeshi pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new 6cdb847d66 optimize: remove the dependency conflict for spring-webmvc
(#7046)
6cdb847d66 is described below
commit 6cdb847d66c40802325172defc105a1d7393c2ae
Author: funkye <jian...@apache.org>
AuthorDate: Wed Dec 4 11:52:33 2024 +0800
optimize: remove the dependency conflict for spring-webmvc (#7046)
---
changes/en-us/2.x.md | 1 +
changes/zh-cn/2.x.md | 1 +
dependencies/pom.xml | 7 -------
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 789242cb85..84612c1080 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 abaa8d4fd9..fd0e5ddc0c 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 cd83dac7f9..a4275c8c14 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -127,7 +127,6 @@
<kotlin-coroutines.version>1.7.3</kotlin-coroutines.version>
<!-- # for web -->
- <spring-webmvc.version>5.3.26</spring-webmvc.version>
<tomcat-embed.version>9.0.90</tomcat-embed.version>
<!-- # for test -->
@@ -880,12 +879,6 @@
<version>${rocketmq-version}</version>
</dependency>
- <!-- web -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <version>${spring-webmvc.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@seata.apache.org
For additional commands, e-mail: notifications-h...@seata.apache.org
