Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

optimize: remove the dependency conflict for spring-webmvc #7046

Merged
merged 2 commits into from
Dec 4, 2024
Merged

optimize: remove the dependency conflict for spring-webmvc #7046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f96f2f
optimize: remove the dependency conflict for spring-webmvc
funky-eyes Dec 4, 2024
dddb5c6
optimize: remove the dependency conflict for spring-webmvc
funky-eyes Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/en-us/2.x.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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>
Loading