diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md index cbb8a0c685d..4d8d2bd8f41 100644 --- a/changes/en-us/2.x.md +++ b/changes/en-us/2.x.md @@ -96,6 +96,7 @@ Add changes here for all PR submitted to the 2.x branch. - [[#6145](https://github.com/apache/incubator-seata/pull/6145)] upgrade jettison to 1.5.4 - [[#6144](https://github.com/apache/incubator-seata/pull/6144)] upgrade nacos client to 1.4.6 - [[#6147](https://github.com/apache/incubator-seata/pull/6147)] upgrade kafka-clients to 3.6.1 +- [[#6339](https://github.com/apache/incubator-seata/pull/6339)] upgrade spring mvc and tomcat.embed - [[#6340](https://github.com/apache/incubator-seata/pull/6340)] upgrade and tidy some dependencies - [[#6350](https://github.com/apache/incubator-seata/pull/6350)] remove enableDegrade properties - [[#6349](https://github.com/apache/incubator-seata/pull/6349)] transfer dockerhub repo diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md index e4988a2317e..4e40ab6da04 100644 --- a/changes/zh-cn/2.x.md +++ b/changes/zh-cn/2.x.md @@ -96,6 +96,7 @@ - [[#6144](https://github.com/apache/incubator-seata/pull/6144)] 升级Nacos依赖版本至1.4.6 - [[#6145](https://github.com/apache/incubator-seata/pull/6145)] 升级 jettison依赖版本至1.5.4 - [[#6147](https://github.com/apache/incubator-seata/pull/6147)] 升级 kafka-clients依赖至3.6.1 +- [[#6339](https://github.com/apache/incubator-seata/pull/6339)] 升级 spring mvc 和 tomcat.embed 依赖 - [[#6340](https://github.com/apache/incubator-seata/pull/6340)] 升级和整理依赖 - [[#6350](https://github.com/apache/incubator-seata/pull/6350)] 移除 enableDegrade 配置 diff --git a/console/pom.xml b/console/pom.xml index 9a03b9b9d80..3723376a432 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -34,6 +34,8 @@ 2.7.17 5.3.30 + 2.0 + 9.0.83 @@ -70,6 +72,16 @@ pom import + + org.yaml + snakeyaml + ${snakeyaml-for-server.version} + + + org.apache.tomcat.embed + tomcat-embed-core + ${tomcat-embed.version} + @@ -89,8 +101,12 @@ spring-boot-starter-web - snakeyaml + org.apache.tomcat.embed + tomcat-embed-core + + org.yaml + snakeyaml @@ -125,6 +141,10 @@ jjwt-jackson runtime + + org.apache.tomcat.embed + tomcat-embed-core + diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 36c788a2acd..ad5b15c6abb 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -119,6 +119,10 @@ 1.4.32 1.4.3 + + 5.3.26 + 9.0.83 + 4.11.0 3.12.2 @@ -157,6 +161,10 @@ org.springframework spring-framework-bom + + org.apache.tomcat.embed + tomcat-embed-core + pom import @@ -773,6 +781,17 @@ janino ${janino-version} + + + + org.springframework + spring-webmvc + ${spring-webmvc.version} + + + org.apache.tomcat.embed + tomcat-embed-core + diff --git a/server/pom.xml b/server/pom.xml index 6d16fd895e7..a8457fa3ea8 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -34,6 +34,8 @@ 2.7.17 5.3.30 + 2.0 + 9.0.83 @@ -70,6 +72,16 @@ pom import + + org.yaml + snakeyaml + ${snakeyaml-for-server.version} + + + org.apache.tomcat.embed + tomcat-embed-core + ${tomcat-embed.version} + @@ -84,8 +96,12 @@ org.apache.logging.log4j - snakeyaml + org.apache.tomcat.embed + tomcat-embed-core + + org.yaml + snakeyaml @@ -257,6 +273,10 @@ org.codehaus.janino janino + + org.apache.tomcat.embed + tomcat-embed-core + diff --git a/test-mock-server/pom.xml b/test-mock-server/pom.xml index 466f42f2af2..74773f94c4d 100644 --- a/test-mock-server/pom.xml +++ b/test-mock-server/pom.xml @@ -41,6 +41,7 @@ + org.apache.seata seata-server diff --git a/test/pom.xml b/test/pom.xml index dc7e8a34212..e02fd088d5f 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -49,6 +49,8 @@ seata-tm ${project.version} + + ${project.groupId} seata-server