From 6a913ee7209a55ac2b46a2b95f16d1d070628232 Mon Sep 17 00:00:00 2001 From: slievrly Date: Sun, 13 Jul 2025 00:15:57 +0800 Subject: [PATCH 1/4] test: fix UT failed in spring-boot-starter --- .github/workflows/test.yml | 2 ++ build/pom.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 59780b0ee06..072ed96a505 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,6 +19,8 @@ name: "test" on: push: branches: [ test*, "*.*.*" ] + pull_request: + branches: [ 2.5.0 ] jobs: # job 1 test: diff --git a/build/pom.xml b/build/pom.xml index 15b4ac5c0cc..3fdc027cd53 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -438,6 +438,8 @@ -Dnet.bytebuddy.experimental=true + + 6.0.0 From 149bbf3a11ff5c12a5f3019204b1e48d2b1f76fe Mon Sep 17 00:00:00 2001 From: slievrly Date: Sun, 13 Jul 2025 00:38:50 +0800 Subject: [PATCH 2/4] test: fix UT failed in spring-boot-starter --- build/pom.xml | 2 -- dependencies/pom.xml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/build/pom.xml b/build/pom.xml index 3fdc027cd53..15b4ac5c0cc 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -438,8 +438,6 @@ -Dnet.bytebuddy.experimental=true - - 6.0.0 diff --git a/dependencies/pom.xml b/dependencies/pom.xml index c461c2cd727..7dee0f9510c 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -64,7 +64,7 @@ 1 1.3.2 4.0.1 - 5.0.0 + 6.0.0 0.7.6 6.3.0 1.0.0 From 9740acad4605d1ae85ecef4874eef04a610cc814 Mon Sep 17 00:00:00 2001 From: slievrly Date: Sun, 13 Jul 2025 01:48:25 +0800 Subject: [PATCH 3/4] test: fix UT failed in spring-boot-starter --- dependencies/pom.xml | 2 +- seata-spring-boot-starter/pom.xml | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 7dee0f9510c..c461c2cd727 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -64,7 +64,7 @@ 1 1.3.2 4.0.1 - 6.0.0 + 5.0.0 0.7.6 6.3.0 1.0.0 diff --git a/seata-spring-boot-starter/pom.xml b/seata-spring-boot-starter/pom.xml index 633686deb79..9c2ef74fddb 100644 --- a/seata-spring-boot-starter/pom.xml +++ b/seata-spring-boot-starter/pom.xml @@ -31,6 +31,10 @@ seata-spring-boot-starter ${project.version} spring-boot-starter for Seata built with Maven + + 5.0.0 + + ${project.groupId} @@ -79,6 +83,7 @@ jakarta.servlet jakarta.servlet-api + ${jakarta.servlet-api.version} test @@ -87,5 +92,17 @@ test + + + + dependencies-for-test-by-jdk17-and-above + + [17,) + + + 6.0.0 + + + From f4bbbcbba25c0c9d0e6ba90f5eda1cd708cc1465 Mon Sep 17 00:00:00 2001 From: slievrly Date: Sun, 13 Jul 2025 10:57:34 +0800 Subject: [PATCH 4/4] add change log --- .github/workflows/test.yml | 2 -- changes/en-us/2.x.md | 13 +++---------- changes/zh-cn/2.x.md | 14 +++----------- 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 072ed96a505..59780b0ee06 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,8 +19,6 @@ name: "test" on: push: branches: [ test*, "*.*.*" ] - pull_request: - branches: [ 2.5.0 ] jobs: # job 1 test: diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md index ff941425874..eae0dbe49df 100644 --- a/changes/en-us/2.x.md +++ b/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,6 +109,7 @@ 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: @@ -120,10 +117,6 @@ Add changes here for all PR submitted to the 2.x branch. - [[#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. diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md index 721d3870a92..44c840689b0 100644 --- a/changes/zh-cn/2.x.md +++ b/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 的代码贡献。若有无意遗漏，请报告。