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 88bba2f579 test: fix jakarta UT failed in jdk17+ (#7541)
88bba2f579 is described below
commit 88bba2f579a753f26e5fdb62861eaa40fc0ed5fd
Author: jimin <[email protected]>
AuthorDate: Thu Jul 17 09:12:05 2025 +0800
test: fix jakarta UT failed in jdk17+ (#7541)
---
changes/en-us/2.x.md | 22 ++++++++++++----------
changes/zh-cn/2.x.md | 22 ++++++++++------------
seata-spring-boot-starter/pom.xml | 17 +++++++++++++++++
3 files changed, 39 insertions(+), 22 deletions(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 31eab7b4af..6a6c110c06 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -20,42 +20,44 @@ Add changes here for all PR submitted to the 2.x branch.
### feature:
-- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] 支持 XXX
+- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] support XXX
### bugfix:
-- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] 修复 XXX
+- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] fix XXX
### optimize:
-- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] 优化 XXX
+- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] optimize XXX
### security:
-- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] 升级 XXX
+- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] upgrade XXX
+
### test:
-- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] 增加 XXX 测试用例
+- [[#7541](https://github.com/seata/seata/pull/7541)] fix jakarta UT failed in
jdk17+
+
### refactor:
-- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] 重构 XXX
+- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] refactor for XXX
### doc:
-- [[#7531](https://github.com/seata/seata/pull/7531)] 优化 Readme 和 change 文档
+- [[#7531](https://github.com/seata/seata/pull/7531)] Optimize the Readme and
change documents
-Thanks to these contributors for their code commits. Please report an
unintended omission.
+非常感谢以下 contributors 的代码贡献。若有无意遗漏，请报告。
-<!-- Please make sure your Github ID is in the list below -->
+<!-- 请确保您的 GitHub ID 在以下列表中 -->
- [slievrly](https://github.com/slievrly)
- [GitHubID](https://github.com/GitHubID)
-Also, we receive many valuable issues, questions and advices from our
community. Thanks for you all.
+同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index 24820f9105..0de05928f9 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -20,44 +20,42 @@
### feature:
-- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] support XXX
+- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] 支持 XXX
### bugfix:
-- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] fix XXX
+- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] 修复 XXX
### optimize:
-- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] optimize XXX
+- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] 优化 XXX
### security:
-- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] upgrade XXX
-
+- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] 升级 XXX
### test:
-- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] add test for XXX
-
+- [[#7541](https://github.com/seata/seata/pull/7541)] 修复 jakarta 依赖在 jdk17+
单测失败问题
### refactor:
-- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] refactor for XXX
+- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] 重构 XXX
### doc:
-- [[#7531](https://github.com/seata/seata/pull/7531)] Optimize the Readme and
change documents
+- [[#7531](https://github.com/seata/seata/pull/7531)] 优化 Readme 和 change 文档
-非常感谢以下 contributors 的代码贡献。若有无意遗漏，请报告。
+Thanks to these contributors for their code commits. Please report an
unintended omission.
-<!-- 请确保您的 GitHub ID 在以下列表中 -->
+<!-- Please make sure your Github ID is in the list below -->
- [slievrly](https://github.com/slievrly)
- [GitHubID](https://github.com/GitHubID)
-同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
+Also, we receive many valuable issues, questions and advices from our
community. Thanks for you all.
diff --git a/seata-spring-boot-starter/pom.xml
b/seata-spring-boot-starter/pom.xml
index 633686deb7..9c2ef74fdd 100644
--- a/seata-spring-boot-starter/pom.xml
+++ b/seata-spring-boot-starter/pom.xml
@@ -31,6 +31,10 @@
<name>seata-spring-boot-starter ${project.version}</name>
<description>spring-boot-starter for Seata built with Maven</description>
+ <properties>
+ <jakarta.servlet-api.version>5.0.0</jakarta.servlet-api.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -79,6 +83,7 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
+ <version>${jakarta.servlet-api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -87,5 +92,17 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <profiles>
+ <!-- notice: dependencies defined in
args-for-test-by-jdk17-and-above profile will be not taken effect in jdk17-->
+ <profile>
+ <id>dependencies-for-test-by-jdk17-and-above</id>
+ <activation>
+ <jdk>[17,)</jdk>
+ </activation>
+ <properties>
+
<jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
+ </properties>
+ </profile>
+ </profiles>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
