Skip to content

Commit

Permalink
optimize: remove the dependency conflict for spring-webmvc (#7046)
Browse files Browse the repository at this point in the history
  • Loading branch information
funky-eyes authored Dec 4, 2024
1 parent b44c626 commit 6cdb847
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 7 deletions.
1 change: 1 addition & 0 deletions changes/en-us/2.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions changes/zh-cn/2.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 模块的依赖
Expand Down
7 changes: 0 additions & 7 deletions dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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>

0 comments on commit 6cdb847

Please sign in to comment.