feature: console/namingserver: spring-boot upgrade to 4.0.6 by xuxiaowei-com-cn · Pull Request #8054 · apache/incubator-seata

xuxiaowei-com-cn · 2026-04-16T11:02:52Z

https://github.com/redis/jedis/blob/master/docs/migration-guides/v3-to-v4.md

I have read the CONTRIBUTING.md guidelines.
I have registered the PR changes.

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

#8053

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

codecov · 2026-04-16T11:13:00Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 72.83%. Comparing base (c92f96f) to head (e4ddf76).

Additional details and impacted files

@@             Coverage Diff              @@
##                2.x    #8054      +/-   ##
============================================
+ Coverage     72.81%   72.83%   +0.02%     
  Complexity     1141     1141              
============================================
  Files          1151     1151              
  Lines         42272    42272              
  Branches       5045     5045              
============================================
+ Hits          30781    30790       +9     
+ Misses         9013     9008       -5     
+ Partials       2478     2474       -4

see 3 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

https://github.com/redis/jedis/blob/master/docs/migration-guides/v3-to-v4.md

Copilot

Pull request overview

This PR upgrades the server / console / namingserver modules to newer Spring Boot / Spring Framework generations and adjusts affected code (Jakarta annotations, Spring Boot API package moves, and related test infrastructure) to keep these modules compiling and running under the newer stack.

Changes:

Bump Spring Boot / Spring Framework versions in module POMs and update affected imports/APIs (e.g., ServerProperties, WebServerInitializedEvent, javax.annotation → jakarta.annotation).
Update Redis/Jedis pooling abstractions and Redis-related tests to match newer Jedis APIs.
Update test infrastructure for the new Spring stack (e.g., @MockBean → @MockitoBean, MockMvc test artifact changes), plus minor CI adjustments.

Reviewed changes

Copilot reviewed 42 out of 42 changed files in this pull request and generated 8 comments.

Show a summary per file

File	Description
server/src/test/java/org/apache/seata/server/storage/redis/store/RedisTransactionStoreManagerTest.java	Updates Redis sorted-set query result types in tests.
server/src/test/java/org/apache/seata/server/storage/redis/JedisPooledFactoryTest.java	Updates pool abstraction usage in Jedis pool tests.
server/src/test/java/org/apache/seata/server/session/redis/RedisQueryConsolTest.java	Migrates `@Resource` import to `jakarta.annotation`.
server/src/test/java/org/apache/seata/server/session/FileSessionManagerTest.java	Migrates `@Resource` import to `jakarta.annotation`.
server/src/test/java/org/apache/seata/server/logging/AppenderTest.java	Modifies Logback context access and disables the test method.
server/src/test/java/org/apache/seata/server/lock/LockManagerTest.java	Migrates `@Resource` import to `jakarta.annotation`.
server/src/test/java/org/apache/seata/server/instance/RaftServerInstanceStrategyTest.java	Updates `ServerProperties` import for newer Spring Boot.
server/src/test/java/org/apache/seata/server/console/impl/db/GlobalSessionDBServiceImplTest.java	Replaces `@MockBean` with `@MockitoBean`.
server/src/test/java/org/apache/seata/server/console/impl/db/GlobalLockDBServiceImplTest.java	Replaces `@MockBean` with `@MockitoBean`.
server/src/test/java/org/apache/seata/server/console/impl/db/BranchSessionDBServiceImplTest.java	Replaces `@MockBean` with `@MockitoBean`.
server/src/test/java/org/apache/seata/server/LoaderConfTest.java	Minor assertion style adjustment (static `assertEquals`).
server/src/main/java/org/apache/seata/server/storage/redis/store/RedisTransactionStoreManager.java	Updates Redis sorted-set query result types for newer Jedis APIs.
server/src/main/java/org/apache/seata/server/storage/redis/JedisPooledFactory.java	Switches Jedis pool type to `Pool<Jedis>` and updates factory signature.
server/src/main/java/org/apache/seata/server/instance/RaftServerInstanceStrategy.java	Migrates `@Resource` import to `jakarta.annotation`.
server/src/main/java/org/apache/seata/server/instance/AbstractSeataInstanceStrategy.java	Migrates lifecycle/resource annotations to `jakarta.annotation` and updates `ServerProperties` import.
server/src/main/java/org/apache/seata/server/controller/ClusterController.java	Migrates `@Resource` import to `jakarta.annotation`.
server/src/main/java/org/apache/seata/server/console/impl/db/GlobalSessionDBServiceImpl.java	Migrates `@Resource` import to `jakarta.annotation`.
server/src/main/java/org/apache/seata/server/console/controller/GlobalSessionController.java	Migrates `@Resource` import to `jakarta.annotation`.
server/src/main/java/org/apache/seata/server/console/controller/GlobalLockController.java	Migrates `@Resource` import to `jakarta.annotation`.
server/src/main/java/org/apache/seata/server/console/controller/BranchSessionController.java	Migrates `@Resource` import to `jakarta.annotation`.
server/src/main/java/org/apache/seata/server/config/ServerConfig.java	Updates `ServerProperties` import for newer Spring Boot.
server/src/main/java/org/apache/seata/server/cluster/raft/context/SeataClusterContext.java	Migrates nullability annotations to `jakarta.annotation`.
server/src/main/java/org/apache/seata/server/cluster/manager/ClusterWatcherManager.java	Migrates `@PostConstruct` import to `jakarta.annotation`.
server/src/main/java/org/apache/seata/server/ServerRunner.java	Migrates `@Resource` and updates `WebServerInitializedEvent` import.
server/src/main/java/org/apache/seata/server/Server.java	Migrates `@Resource` import to `jakarta.annotation`.
server/pom.xml	Upgrades Spring Boot / Framework versions and adds a Spring Boot web-server dependency.
namingserver/src/test/java/org/apache/seata/namingserver/AuthControllerWithRandomPasswordTest.java	Updates MockMvc auto-config import and ObjectMapper package.
namingserver/src/test/java/org/apache/seata/namingserver/AuthControllerWithCustomPropertiesTest.java	Updates MockMvc auto-config import and ObjectMapper package.
namingserver/src/main/java/org/apache/seata/namingserver/service/ConsoleLocalServiceImpl.java	Switches ObjectMapper package and simplifies namespace serialization logic.
namingserver/src/main/java/org/apache/seata/namingserver/config/WebConfig.java	Replaces OkHttp-based RestTemplate factory with JDK HttpClient-based factory.
namingserver/pom.xml	Upgrades Spring Boot / Framework versions and adds webmvc-test dependency (test scope).
console/src/main/java/org/apache/seata/mcp/tools/NameSpaceTools.java	Switches to Jackson 3 (`tools.jackson`) and removes JSON parse exception handling.
console/src/main/java/org/apache/seata/mcp/tools/GlobalSessionTools.java	Switches to Jackson 3 (`tools.jackson`) and removes JSON parse exception handling.
console/src/main/java/org/apache/seata/mcp/tools/GlobalLockTools.java	Switches to Jackson 3 (`tools.jackson`) and removes JSON parse exception handling.
console/src/main/java/org/apache/seata/mcp/service/impl/ConsoleRemoteServiceImpl.java	Switches ObjectMapper import to Jackson 3 (`tools.jackson`).
console/src/main/java/org/apache/seata/mcp/core/utils/UrlUtils.java	Switches Jackson imports to Jackson 3 (`tools.jackson`).
console/src/main/java/org/apache/seata/console/config/WebSecurityConfig.java	Updates Security matcher construction for newer Spring Security APIs.
console/src/main/java/org/apache/seata/console/config/JacksonConfig.java	Replaces Jackson2 builder customizer with a Jackson 3 `SimpleModule` serializer.
console/pom.xml	Upgrades Spring Boot / Framework versions and bumps Tomcat embed version.
changes/zh-cn/2.x.md	Adds changelog entry for this upgrade.
changes/en-us/2.x.md	Adds changelog entry for this upgrade.
.github/workflows/build.yml	Excludes `server` from the Java 8 job build list.

Comments suppressed due to low confidence (1)

server/pom.xml:108

With the Spring Boot 4 / Spring Framework 7 upgrade in this module, the server should be consistently on the jakarta.* servlet APIs. server/pom.xml still declares a dependency on javax.servlet:javax.servlet-api (later in the dependencies list), which will conflict with the Jakarta-based web stack and can lead to compilation/type-mismatch issues. Please switch the servlet API dependency to the appropriate jakarta.servlet artifact (or remove it if it’s no longer needed).

        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-web-server</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter</artifactId>
        </dependency>

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

…ecover

…ix jackson 3

…lean

…ix objectMapper.readValue

…ix objectMapper.readTree

…ix import

…ix objectMapper.writeValueAsString

…ix jackson 3

…dd dependency

…ix AppenderTest

xuxiaowei-com-cn

LGTM

…4.0.6

# Conflicts: # changes/en-us/2.x.md # changes/zh-cn/2.x.md # console/pom.xml # namingserver/pom.xml

…test package

# Conflicts: # changes/en-us/2.x.md # changes/zh-cn/2.x.md

xuxiaowei-com-cn · 2026-06-09T06:19:09Z

feature: server: spring-boot upgrade to 4.0.6

Copilot

Pull request overview

Copilot reviewed 17 out of 17 changed files in this pull request and generated 1 comment.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 17 out of 17 changed files in this pull request and generated 5 comments.

+        } catch (JacksonException e) {
            logger.error(e.getMessage());
        }


+        } catch (JacksonException e) {
            LOGGER.error("Get NameSpace failed: {}", e.getMessage());
            return "Failed to get namespace";
        }


        String result = mcpRPCService.getCallTC(
                nameSpaceDetail, RPCConstant.GLOBAL_SESSION_BASE_URL + "/query", param, null, null);
        try {
            pageResult = objectMapper.readValue(result, new TypeReference<PageResult<McpGlobalSessionVO>>() {});
-        } catch (JsonProcessingException e) {
+        } catch (JacksonException e) {


        String response = mcpRPCService.getCallTC(
                nameSpaceDetail, RPCConstant.GLOBAL_LOCK_BASE_URL + "/query", param, null, null);
        try {
            result = objectMapper.readValue(response, new TypeReference<PageResult<McpGlobalLockVO>>() {});
-        } catch (JsonProcessingException e) {
+        } catch (JacksonException e) {


Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

xuxiaowei-com-cn force-pushed the xuxiaowei/spring-boot-4.x branch from b13848a to 08445e9 Compare April 16, 2026 11:40

xuxiaowei-com-cn added 2 commits April 16, 2026 20:06

feature: console/namingserver/server: spring-boot upgrade to 4.0.5

4c471a8

https://github.com/redis/jedis/blob/master/docs/migration-guides/v3-to-v4.md

feature: disabled test AppenderTest#testAppenderEnabled

7677556

xuxiaowei-com-cn force-pushed the xuxiaowei/spring-boot-4.x branch from de2a3ce to 7677556 Compare April 16, 2026 12:07

funky-eyes added type: feature Category issues or prs related to feature request. module/server server module module/console module/namingserver labels Apr 17, 2026

funky-eyes added this to the 2.x Backlog milestone Apr 17, 2026

funky-eyes requested a review from Copilot April 17, 2026 09:06

Copilot started reviewing on behalf of funky-eyes April 17, 2026 09:06 View session

Copilot AI reviewed Apr 17, 2026

View reviewed changes

xuxiaowei-com-cn mentioned this pull request Apr 18, 2026

console/namingserver/server: spring-boot upgrade to 4.x #8053

Closed

2 tasks

xuxiaowei-com-cn added 13 commits April 27, 2026 15:52

Merge branch '2.x' into xuxiaowei/spring-boot-4.x

74a215a

Merge branch '2.x' into xuxiaowei/spring-boot-4.x

de2a0a9

feature: console/namingserver/server: spring-boot upgrade to 4.0.5: r…

97a44d8

…ecover

feature: console/namingserver/server: spring-boot upgrade to 4.0.5: f…

8bedc77

…ix jackson 3

feature: console/namingserver/server: spring-boot upgrade to 4.0.5: c…

4188fdc

…lean

feature: console/namingserver/server: spring-boot upgrade to 4.0.5: f…

2da5ce1

…ix objectMapper.readValue

feature: console/namingserver/server: spring-boot upgrade to 4.0.5: f…

9b9b7fb

…ix objectMapper.readTree

feature: console/namingserver/server: spring-boot upgrade to 4.0.5: f…

7559add

…ix import

feature: console/namingserver/server: spring-boot upgrade to 4.0.5: f…

e5266cf

…ix objectMapper.writeValueAsString

feature: console/namingserver/server: spring-boot upgrade to 4.0.5: f…

d2a8276

…ix jackson 3

feature: console/namingserver/server: spring-boot upgrade to 4.0.5: a…

c6417c3

…dd dependency

feature: console/namingserver/server: spring-boot upgrade to 4.0.6

c56c0f0

feature: console/namingserver/server: spring-boot upgrade to 4.0.6: f…

421999c

…ix AppenderTest

xuxiaowei-com-cn commented Apr 29, 2026

View reviewed changes

xuxiaowei-com-cn added 2 commits May 3, 2026 22:57

Merge branch '2.x' into xuxiaowei/spring-boot-4.x

a454fc4

Merge branch '2.x' into xuxiaowei/spring-boot-4.x

c61161a

xuxiaowei-com-cn added 12 commits May 8, 2026 18:28

optimize: console/namingserver/server modules：spring-boot upgrade to …

00f911f

…4.0.6

Merge branch '2.x' into xuxiaowei/spring-boot-4.x

7756068

Merge branch '2.x' into xuxiaowei/spring-boot-4.x

fbb74ec

Merge branch '2.x' into xuxiaowei/spring-boot-4.x

372c37b

Merge remote-tracking branch 'origin/2.x' into xuxiaowei/spring-boot-4.x

b079b7d

chore: remove duplicate changelog entries

22585c2

Merge remote-tracking branch 'origin/2.x' into xuxiaowei/spring-boot-4.x

67583a3

Merge branch '2.x' into xuxiaowei/spring-boot-4.x

68fa525

Merge remote-tracking branch 'origin/2.x' into xuxiaowei/spring-boot-4.x

94b5946

# Conflicts: # changes/en-us/2.x.md # changes/zh-cn/2.x.md # console/pom.xml # namingserver/pom.xml

Merge branch '2.x' into xuxiaowei/spring-boot-4.x

1ca5d32

adapt: update AutoConfigureMockMvc import for Spring Boot 4.x webmvc …

c8d20de

…test package

Merge remote-tracking branch 'origin/2.x' into xuxiaowei/spring-boot-4.x

accbfe9

# Conflicts: # changes/en-us/2.x.md # changes/zh-cn/2.x.md

xuxiaowei-com-cn changed the title ~~feature: console/namingserver/server: spring-boot upgrade to 4.0.6~~ feature: console/namingserver: spring-boot upgrade to 4.0.6 Jun 9, 2026

feature: console/namingserver: spring-boot upgrade to 4.0.6

72bea95

xuxiaowei-com-cn added 4 commits June 10, 2026 14:25

Merge branch '2.x' into xuxiaowei/spring-boot-4.x

5b6ca02

Merge branch '2.x' into xuxiaowei/spring-boot-4.x

28ad948

spotless: apply code formatting to LockStoreDataBaseDAOBatchAcquireTest

3ce5cc3

Merge branch '2.x' into xuxiaowei/spring-boot-4.x

7d3a17e

funky-eyes removed the module/server server module label Jun 30, 2026

funky-eyes modified the milestones: 2.x Backlog, 2.8.0 Jun 30, 2026

funky-eyes requested a review from Copilot June 30, 2026 05:46

Copilot started reviewing on behalf of funky-eyes June 30, 2026 05:46 View session

Copilot AI reviewed Jun 30, 2026

View reviewed changes

Comment thread console/src/main/java/org/apache/seata/console/config/WebSecurityConfig.java Outdated

Potential fix for pull request finding

7f2f10d

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

funky-eyes requested a review from Copilot July 2, 2026 08:22

Copilot started reviewing on behalf of funky-eyes July 2, 2026 08:22 View session

Copilot AI reviewed Jul 2, 2026

View reviewed changes

Potential fix for pull request finding

e4ddf76

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feature: console/namingserver: spring-boot upgrade to 4.0.6#8054

feature: console/namingserver: spring-boot upgrade to 4.0.6#8054
xuxiaowei-com-cn wants to merge 38 commits into
apache:2.xfrom
xuxiaowei-com-cn:xuxiaowei/spring-boot-4.x

xuxiaowei-com-cn commented Apr 16, 2026 •

edited

Loading

Uh oh!

codecov Bot commented Apr 16, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

xuxiaowei-com-cn left a comment

Uh oh!

xuxiaowei-com-cn commented Jun 9, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

xuxiaowei-com-cn commented Apr 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

Uh oh!

codecov Bot commented Apr 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

xuxiaowei-com-cn left a comment

Choose a reason for hiding this comment

Uh oh!

xuxiaowei-com-cn commented Jun 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

xuxiaowei-com-cn commented Apr 16, 2026 •

edited

Loading

codecov Bot commented Apr 16, 2026 •

edited

Loading

xuxiaowei-com-cn commented Jun 9, 2026 •

edited

Loading