test: fix UT failed in spring-boot-starter

changes/en-us/2.x.md

@@ -35,7 +35,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#7502](https://github.com/apache/incubator-seata/pull/7502)] remove extra dots and keep the naming style consistent with other tables
 - [[#7498](https://github.com/apache/incubator-seata/pull/7498)] fix the class name whitelist check issue in fury deserialization
 - [[#7504](https://github.com/apache/incubator-seata/pull/7504)] fix load driver class in Hikari
-- [[#7512](https://github.com/apache/incubator-seata/pull/7512)] fix the server does not send heartbeats when the namingserver is used with other registries
+- [[#7529](https://github.com/apache/incubator-seata/pull/7529)] fix the server does not send heartbeats when the namingserver is used with other registries
 
 
 ### optimize:
@@ -73,11 +73,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#7483](https://github.com/apache/incubator-seata/pull/7483)] change the value of retryDeadThreshold to 70 seconds
 - [[#7488](https://github.com/apache/incubator-seata/pull/7488)] upgrade tomcat to 9.0.106
 - [[#7518](https://github.com/apache/incubator-seata/pull/7518)] avoid using unstable API in ChannelEventHandlerIntegrationTest
-- [[#7526](https://github.com/apache/incubator-seata/pull/7518)] optimze: optimize 1.2.12 test-druid ci
-
-### security:
-
-- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] upgrade XXX
+- [[#7530](https://github.com/apache/incubator-seata/pull/7530)] optimize 1.2.12 test-druid CI
 
 ### test:
 
@@ -113,17 +109,14 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#7464](https://github.com/apache/incubator-seata/pull/7464)] improve unit test coverage of seata-gRPC moudle
 - [[#7468](https://github.com/apache/incubator-seata/pull/7468)] add UT for SupportSqlWhereMethod class
 - [[#7501](https://github.com/apache/incubator-seata/pull/7501)] add unit test case for fury serializer
+- [[#7528](https://github.com/apache/incubator-seata/pull/7528)] fix UT failed in spring-boot-starter
 
 ### refactor:
 
 - [[#7315](https://github.com/apache/incubator-seata/pull/7315)] Refactor log testing to use ListAppender for more accurate and efficient log capture
 - [[#7461](https://github.com/apache/incubator-seata/pull/7461)] Refactor server netty config changed to use CONFIG format
 
 
-### doc:
-
-- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] doc XXX
-
 
 Thanks to these contributors for their code commits. Please report an unintended omission.
 

changes/zh-cn/2.x.md

@@ -35,7 +35,7 @@
 - [[#7502](https://github.com/apache/incubator-seata/pull/7502)] 删除多余点号和保持命名规范统一
 - [[#7498](https://github.com/apache/incubator-seata/pull/7498)] 修复fury反序列化的类名白名单检查问题
 - [[#7504](https://github.com/apache/incubator-seata/pull/7504)] 修复 Hikari 中的加载驱动程序类
-- [[#7512](https://github.com/apache/incubator-seata/pull/7512)] 修复多注册中心下server不会向namingserver发送心跳的问题
+- [[#7529](https://github.com/apache/incubator-seata/pull/7529)] 修复多注册中心下server不会向namingserver发送心跳的问题
 
 
 ### optimize:
@@ -71,11 +71,7 @@
 - [[#7478](https://github.com/apache/incubator-seata/pull/7478)] 增加处于重试状态的数据采集
 - [[#7483](https://github.com/apache/incubator-seata/pull/7483)] 将retryDeadThreshold改为70秒
 - [[#7518](https://github.com/apache/incubator-seata/pull/7518)] 避免在 ChannelEventHandlerIntegrationTest 中使用不稳定的 API
-- [[#7526](https://github.com/apache/incubator-seata/pull/7518)] 优化druid 1.2.12 ci
-
-### security:
-
-- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] upgrade XXX
+- [[#7530](https://github.com/apache/incubator-seata/pull/7530)] 优化druid 1.2.12 ci
 
 
 ### test:
@@ -113,6 +109,7 @@
 - [[#7464](https://github.com/apache/incubator-seata/pull/7464)] 增加 gRPC 模块的单测
 - [[#7468](https://github.com/apache/incubator-seata/pull/7468)] 为 SupportSqlWhereMethod 类添加 UT
 - [[#7501](https://github.com/apache/incubator-seata/pull/7501)] 补充Fury的单元测试用例
+- [[#7528](https://github.com/apache/incubator-seata/pull/7528)] 修复 spring-boot-starter 模块的单测失败问题
 
 
 ### refactor:
@@ -121,11 +118,6 @@
 - [[#7461](https://github.com/apache/incubator-seata/pull/7461)] 重构 server netty 配置改为使用 CONFIG 格式
 
 
-### doc:
-
-- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] doc XXX
-
-
 非常感谢以下 contributors 的代码贡献。若有无意遗漏，请报告。
 
 <!-- 请确保您的 GitHub ID 在以下列表中 -->

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>