This is an automated email from the ASF dual-hosted git repository.
jianbin 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 86029bb300 optimize: upgrade tomcat-embed to 9.0.98 (#7134)
86029bb300 is described below
commit 86029bb300a7b0934af058c3ebac657e54c27b4e
Author: jimin <sliev...@163.com>
AuthorDate: Wed Feb 5 11:31:06 2025 +0800
optimize: upgrade tomcat-embed to 9.0.98 (#7134)
---
changes/en-us/2.x.md | 1 +
changes/zh-cn/2.x.md | 1 +
console/pom.xml | 2 +-
dependencies/pom.xml | 2 +-
distribution/LICENSE | 8 ++++----
distribution/NOTICE.md | 32 ++++++++++++++++----------------
mock-server/pom.xml | 2 +-
namingserver/pom.xml | 2 +-
server/pom.xml | 2 +-
9 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 03f37785d6..f528638cf9 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -27,6 +27,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#7089](https://github.com/apache/incubator-seata/pull/7089)] support
instance registration to the registry center
- [[#7093](https://github.com/apache/incubator-seata/pull/7093)] add a test
workflow for JDK 21
- [[#7131](https://github.com/apache/incubator-seata/pull/7131)] Remove
org.codehaus.jackson dependency
+- [[#7134](https://github.com/apache/incubator-seata/pull/7134)] upgrade
tomcat-embed to 9.0.98
### security:
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index 12333f83d1..3633280de7 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -26,6 +26,7 @@
- [[#7089](https://github.com/apache/incubator-seata/pull/7089)]
新增instance注册到注册中心的接口
- [[#7093](https://github.com/apache/incubator-seata/pull/7093)] 增加jdk21的工作流测试
- [[#7131](https://github.com/apache/incubator-seata/pull/7131)] 移除
org.codehaus.jackson 依赖
+- [[#7134](https://github.com/apache/incubator-seata/pull/7134)] 升级
tomcat-embed 至 9.0.98 版本
### security:
diff --git a/console/pom.xml b/console/pom.xml
index 16fba6a55e..b4438f808f 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -35,7 +35,7 @@
<spring-boot-for-server.version>2.7.18</spring-boot-for-server.version>
<spring-framework-for-server.version>5.3.39</spring-framework-for-server.version>
<snakeyaml-for-server.version>2.0</snakeyaml-for-server.version>
- <tomcat-embed.version>9.0.90</tomcat-embed.version>
+ <tomcat-embed.version>9.0.98</tomcat-embed.version>
</properties>
<dependencyManagement>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index a68d94704a..a114ffed81 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -88,7 +88,7 @@
<xstream.version>1.4.20</xstream.version>
<checker-qual.version>3.37.0</checker-qual.version>
<error_prone_annotations.version>2.21.1</error_prone_annotations.version>
- <tomcat-embed.version>9.0.90</tomcat-embed.version>
+ <tomcat-embed.version>9.0.98</tomcat-embed.version>
<!-- The `httpcore` and `httpclient` have been removed in spring-boot
3.1.0 and above. -->
<httpcore.version>4.4.16</httpcore.version>
diff --git a/distribution/LICENSE b/distribution/LICENSE
index c2cf0240dc..a794ac5e94 100644
--- a/distribution/LICENSE
+++ b/distribution/LICENSE
@@ -357,9 +357,9 @@ Apache-2.0 licenses
org.apache.rocketmq:rocketmq-common 5.0.0 Apache-2.0
org.apache.rocketmq:rocketmq-logging 5.0.0 Apache-2.0
org.apache.rocketmq:rocketmq-remoting 5.0.0 Apache-2.0
- org.apache.tomcat.embed:tomcat-embed-el 9.0.90 Apache-2.0
- org.apache.tomcat.embed:tomcat-embed-websocket 9.0.90 Apache-2.0
- org.apache.tomcat:tomcat-annotations-api 9.0.83 Apache-2.0
+ org.apache.tomcat.embed:tomcat-embed-el 9.0.98 Apache-2.0
+ org.apache.tomcat.embed:tomcat-embed-websocket 9.0.98 Apache-2.0
+ org.apache.tomcat:tomcat-annotations-api 9.0.98 Apache-2.0
org.apache.yetus:audience-annotations 0.12.0 Apache-2.0
org.awaitility:awaitility 4.0.3 Apache-2.0
org.codehaus.groovy:groovy-all 2.4.4 Apache-2.0
@@ -406,7 +406,7 @@ Apache-2.0 licenses
org.apache.zookeeper:zookeeper 3.7.2 Apache-2.0
org.apache.zookeeper:zookeeper-jute 3.7.2 Apache-2.0
org.apache.skywalking 8.4.0 Apache-2.0
- org.apache.tomcat.embed:tomcat-embed-core 9.0.90 Apache-2.0
+ org.apache.tomcat.embed:tomcat-embed-core 9.0.98 Apache-2.0
net.java.dev.jna:jna 5.5.0 Apache-2.0
org.rocksdb:rocksdbjni 8.8.1 Apache-2.0
org.springframework:spring-aop 5.3.39 Apache-2.0
diff --git a/distribution/NOTICE.md b/distribution/NOTICE.md
index 80f4fa2777..04487a60a9 100644
--- a/distribution/NOTICE.md
+++ b/distribution/NOTICE.md
@@ -91,10 +91,10 @@ Please copy database driver dependencies, such as
`mysql-connector-java.jar`, to
│ │ ├── spring-jcl-5.3.39.jar
│ │ ├── spring-web-5.3.39.jar
│ │ ├── spring-webmvc-5.3.39.jar
-│ │ ├── tomcat-annotations-api-9.0.83.jar
-│ │ ├── tomcat-embed-core-9.0.90.jar
-│ │ ├── tomcat-embed-el-9.0.90.jar
-│ │ └── tomcat-embed-websocket-9.0.90.jar
+│ │ ├── tomcat-annotations-api-9.0.98.jar
+│ │ ├── tomcat-embed-core-9.0.98.jar
+│ │ ├── tomcat-embed-el-9.0.98.jar
+│ │ └── tomcat-embed-websocket-9.0.98.jar
│ └── target
│ └── seata-namingserver.jar
└── seata-server
@@ -354,10 +354,10 @@ Please copy database driver dependencies, such as
`mysql-connector-java.jar`, to
│ ├── spring-test-5.3.39.jar
│ ├── spring-web-5.3.39.jar
│ ├── spring-webmvc-5.3.39.jar
- │ ├── tomcat-annotations-api-9.0.83.jar
- │ ├── tomcat-embed-core-9.0.90.jar
- │ ├── tomcat-embed-el-9.0.90.jar
- │ ├── tomcat-embed-websocket-9.0.90.jar
+ │ ├── tomcat-annotations-api-9.0.98.jar
+ │ ├── tomcat-embed-core-9.0.98.jar
+ │ ├── tomcat-embed-el-9.0.98.jar
+ │ ├── tomcat-embed-websocket-9.0.98.jar
│ ├── xstream-1.4.20.jar
│ ├── zookeeper-3.7.2.jar
│ ├── zookeeper-jute-3.7.2.jar
@@ -510,10 +510,10 @@ Please copy database driver dependencies, such as
`mysql-connector-java.jar`, to
│ │ ├── spring-jcl-5.3.39.jar
│ │ ├── spring-web-5.3.39.jar
│ │ ├── spring-webmvc-5.3.39.jar
-│ │ ├── tomcat-annotations-api-9.0.83.jar
-│ │ ├── tomcat-embed-core-9.0.90.jar
-│ │ ├── tomcat-embed-el-9.0.90.jar
-│ │ └── tomcat-embed-websocket-9.0.90.jar
+│ │ ├── tomcat-annotations-api-9.0.98.jar
+│ │ ├── tomcat-embed-core-9.0.98.jar
+│ │ ├── tomcat-embed-el-9.0.98.jar
+│ │ └── tomcat-embed-websocket-9.0.98.jar
│ └── target
│ └── seata-namingserver.jar
└── seata-server
@@ -774,10 +774,10 @@ Please copy database driver dependencies, such as
`mysql-connector-java.jar`, to
│ ├── spring-test-5.3.39.jar
│ ├── spring-web-5.3.39.jar
│ ├── spring-webmvc-5.3.39.jar
- │ ├── tomcat-annotations-api-9.0.83.jar
- │ ├── tomcat-embed-core-9.0.90.jar
- │ ├── tomcat-embed-el-9.0.90.jar
- │ ├── tomcat-embed-websocket-9.0.90.jar
+ │ ├── tomcat-annotations-api-9.0.98.jar
+ │ ├── tomcat-embed-core-9.0.98.jar
+ │ ├── tomcat-embed-el-9.0.98.jar
+ │ ├── tomcat-embed-websocket-9.0.98.jar
│ ├── xstream-1.4.20.jar
│ ├── zookeeper-3.7.2.jar
│ ├── zookeeper-jute-3.7.2.jar
diff --git a/mock-server/pom.xml b/mock-server/pom.xml
index d23ba4e4f0..08f26ad036 100644
--- a/mock-server/pom.xml
+++ b/mock-server/pom.xml
@@ -58,7 +58,7 @@
<spring-boot-for-server.version>2.7.18</spring-boot-for-server.version>
<spring-framework-for-server.version>5.3.39</spring-framework-for-server.version>
<snakeyaml-for-server.version>2.0</snakeyaml-for-server.version>
- <tomcat-embed.version>9.0.90</tomcat-embed.version>
+ <tomcat-embed.version>9.0.98</tomcat-embed.version>
</properties>
<dependencyManagement>
<dependencies>
diff --git a/namingserver/pom.xml b/namingserver/pom.xml
index a34b0027b9..fdc7c9f12c 100644
--- a/namingserver/pom.xml
+++ b/namingserver/pom.xml
@@ -35,7 +35,7 @@
<spring-boot-for-server.version>2.7.18</spring-boot-for-server.version>
<spring-framework-for-server.version>5.3.39</spring-framework-for-server.version>
<snakeyaml-for-server.version>2.0</snakeyaml-for-server.version>
- <tomcat-embed.version>9.0.90</tomcat-embed.version>
+ <tomcat-embed.version>9.0.98</tomcat-embed.version>
</properties>
<dependencyManagement>
diff --git a/server/pom.xml b/server/pom.xml
index e7d9dc9872..dba1d3f5ff 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -35,7 +35,7 @@
<spring-boot-for-server.version>2.7.18</spring-boot-for-server.version>
<spring-framework-for-server.version>5.3.39</spring-framework-for-server.version>
<snakeyaml-for-server.version>2.0</snakeyaml-for-server.version>
- <tomcat-embed.version>9.0.90</tomcat-embed.version>
+ <tomcat-embed.version>9.0.98</tomcat-embed.version>
</properties>
<dependencyManagement>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@seata.apache.org
For additional commands, e-mail: notifications-h...@seata.apache.org
