feature: server: spring-boot upgrade to 4.0.6

.github/workflows/build.yml

@@ -106,6 +106,7 @@ jobs:
         if: matrix.java == '8'
         run: |
           ./mvnw -T 4C clean test \
+                 -pl '!server,!test-suite/test-new-version,!extensions/apm/apm-seata-skywalking-plugin' \
                  -Dlicense.skip=false -DredisCaseEnabled=true -DnacosCaseEnabled=true \
                  -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
       # step 6.3

changes/en-us/2.x.md

@@ -30,6 +30,7 @@ Add changes here for all PR submitted to the 2.x branch.
 
 
 ### optimize:
+- [[#8137](https://github.com/apache/incubator-seata/pull/8137)] server modules: spring-boot upgrade to 4.0.6
 
 
 ### security:
@@ -49,6 +50,7 @@ Thanks to these contributors for their code commits. Please report an unintended
 <!-- Please make sure your Github ID is in the list below -->
 
 - [slievrly](https://github.com/slievrly)
+- [xuxiaowei-com-cn](https://github.com/xuxiaowei-com-cn)
 - [Seol-JY](https://github.com/Seol-JY)
 - [lhozy](https://github.com/lhozy)
 - [Zhengcy05](https://github.com/Zhengcy05)

changes/zh-cn/2.x.md

@@ -29,6 +29,7 @@
 
 
 ### optimize:
+- [[#8137](https://github.com/apache/incubator-seata/pull/8137)] server 模块: spring-boot 升级到 4.0.6
 
 
 ### security:
@@ -48,6 +49,7 @@
 <!-- 请确保您的 GitHub ID 在以下列表中 -->
 
 - [slievrly](https://github.com/slievrly)
+- [xuxiaowei-com-cn](https://github.com/xuxiaowei-com-cn)
 - [Seol-JY](https://github.com/Seol-JY)
 - [lhozy](https://github.com/lhozy)
 - [Zhengcy05](https://github.com/Zhengcy05)

server/pom.xml

@@ -32,9 +32,10 @@
     <description>server for Seata built with Maven</description>
 
     <properties>
-        <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>
+        <spring-boot-for-server.version>4.0.6</spring-boot-for-server.version>
+        <spring-framework-for-server.version>7.0.7</spring-framework-for-server.version>
         <snakeyaml-for-server.version>2.0</snakeyaml-for-server.version>
+        <junit-jupiter.version>6.0.3</junit-jupiter.version>
     </properties>
 
     <dependencyManagement>
@@ -97,6 +98,10 @@
 
     <dependencies>
         <!-- springboot -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-web-server</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>

server/src/main/java/org/apache/seata/server/Server.java

@@ -16,6 +16,7 @@
  */
 package org.apache.seata.server;
 
+import jakarta.annotation.Resource;
 import org.apache.seata.common.XID;
 import org.apache.seata.common.holder.ObjectHolder;
 import org.apache.seata.common.thread.ThreadPoolExecutorFactory;
@@ -35,7 +36,6 @@
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.util.Optional;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;

server/src/main/java/org/apache/seata/server/ServerRunner.java

@@ -16,19 +16,19 @@
  */
 package org.apache.seata.server;
 
+import jakarta.annotation.Resource;
 import org.apache.seata.core.rpc.Disposable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.CommandLineRunner;
-import org.springframework.boot.web.context.WebServerInitializedEvent;
+import org.springframework.boot.web.server.context.WebServerInitializedEvent;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.core.Ordered;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 

server/src/main/java/org/apache/seata/server/cluster/manager/ClusterWatcherManager.java

@@ -31,6 +31,7 @@
 import io.netty.handler.codec.http2.DefaultHttp2Headers;
 import io.netty.handler.codec.http2.DefaultHttp2HeadersFrame;
 import io.netty.handler.codec.http2.Http2Headers;
+import jakarta.annotation.PostConstruct;
 import org.apache.seata.common.ConfigurationKeys;
 import org.apache.seata.common.Constants;
 import org.apache.seata.common.metadata.MetadataResponse;
@@ -51,7 +52,6 @@
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashSet;

server/src/main/java/org/apache/seata/server/cluster/raft/context/SeataClusterContext.java

@@ -16,14 +16,13 @@
  */
 package org.apache.seata.server.cluster.raft.context;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import org.apache.seata.common.ConfigurationKeys;
 import org.apache.seata.config.ConfigurationFactory;
 import org.apache.seata.core.context.ContextCore;
 import org.apache.seata.core.context.ContextCoreLoader;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import static org.apache.seata.common.DefaultValues.DEFAULT_SEATA_GROUP;
 
 /**

server/src/main/java/org/apache/seata/server/config/ServerConfig.java

@@ -16,7 +16,7 @@
  */
 package org.apache.seata.server.config;
 
-import org.springframework.boot.autoconfigure.web.ServerProperties;
+import org.springframework.boot.web.server.autoconfigure.ServerProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

server/src/main/java/org/apache/seata/server/console/controller/BranchSessionController.java

@@ -16,6 +16,7 @@
  */
 package org.apache.seata.server.console.controller;
 
+import jakarta.annotation.Resource;
 import org.apache.seata.common.result.SingleResult;
 import org.apache.seata.server.console.service.BranchSessionService;
 import org.slf4j.Logger;
@@ -25,8 +26,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
-
 /**
  * Branch Session Controller
  */

server/src/main/java/org/apache/seata/server/console/controller/GlobalLockController.java

@@ -16,6 +16,7 @@
  */
 package org.apache.seata.server.console.controller;
 
+import jakarta.annotation.Resource;
 import org.apache.seata.common.result.PageResult;
 import org.apache.seata.common.result.SingleResult;
 import org.apache.seata.server.console.entity.param.GlobalLockParam;
@@ -29,8 +30,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
-
 /**
  * Global Lock Controller
  */

server/src/main/java/org/apache/seata/server/console/controller/GlobalSessionController.java

@@ -16,6 +16,7 @@
  */
 package org.apache.seata.server.console.controller;
 
+import jakarta.annotation.Resource;
 import org.apache.seata.common.result.PageResult;
 import org.apache.seata.common.result.SingleResult;
 import org.apache.seata.server.console.entity.param.GlobalSessionParam;
@@ -30,8 +31,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
-
 /**
  * Global Session Controller
  */

server/src/main/java/org/apache/seata/server/console/impl/db/GlobalSessionDBServiceImpl.java

@@ -16,6 +16,7 @@
  */
 package org.apache.seata.server.console.impl.db;
 
+import jakarta.annotation.Resource;
 import org.apache.seata.common.ConfigurationKeys;
 import org.apache.seata.common.exception.StoreException;
 import org.apache.seata.common.loader.EnhancedServiceLoader;
@@ -36,7 +37,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.PreparedStatement;

server/src/main/java/org/apache/seata/server/controller/ClusterController.java

@@ -18,6 +18,7 @@
 
 import com.alipay.sofa.jraft.RouteTable;
 import com.alipay.sofa.jraft.conf.Configuration;
+import jakarta.annotation.Resource;
 import org.apache.seata.common.metadata.MetadataResponse;
 import org.apache.seata.common.result.Result;
 import org.apache.seata.common.rpc.http.HttpContext;
@@ -31,7 +32,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
 import java.util.Map;
 
 @RestController

server/src/main/java/org/apache/seata/server/instance/AbstractSeataInstanceStrategy.java

@@ -16,6 +16,9 @@
  */
 package org.apache.seata.server.instance;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.annotation.Resource;
 import org.apache.seata.common.metadata.Instance;
 import org.apache.seata.common.thread.ThreadPoolExecutorFactory;
 import org.apache.seata.core.protocol.Version;
@@ -25,12 +28,9 @@
 import org.apache.seata.spring.boot.autoconfigure.properties.registry.RegistryProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.boot.autoconfigure.web.ServerProperties;
+import org.springframework.boot.web.server.autoconfigure.ServerProperties;
 import org.springframework.context.ApplicationContext;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.Optional;
 import java.util.concurrent.ScheduledExecutorService;

server/src/main/java/org/apache/seata/server/instance/RaftServerInstanceStrategy.java

@@ -17,6 +17,7 @@
 package org.apache.seata.server.instance;
 
 import com.alipay.sofa.jraft.entity.PeerId;
+import jakarta.annotation.Resource;
 import org.apache.seata.common.XID;
 import org.apache.seata.common.holder.ObjectHolder;
 import org.apache.seata.common.metadata.ClusterRole;
@@ -36,8 +37,6 @@
 import org.springframework.core.env.PropertySource;
 import org.springframework.scheduling.annotation.Async;
 
-import javax.annotation.Resource;
-
 import static org.apache.seata.common.ConfigurationKeys.META_PREFIX;
 import static org.apache.seata.common.Constants.OBJECT_KEY_SPRING_CONFIGURABLE_ENVIRONMENT;
 

server/src/main/java/org/apache/seata/server/storage/redis/JedisPooledFactory.java

@@ -26,10 +26,10 @@
 import org.slf4j.LoggerFactory;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.JedisPoolAbstract;
 import redis.clients.jedis.JedisPoolConfig;
 import redis.clients.jedis.JedisSentinelPool;
 import redis.clients.jedis.Protocol;
+import redis.clients.jedis.util.Pool;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -47,7 +47,7 @@ public class JedisPooledFactory {
      */
     protected static final Logger LOGGER = LoggerFactory.getLogger(JedisPooledFactory.class);
 
-    private static volatile JedisPoolAbstract jedisPool = null;
+    private static volatile Pool<Jedis> jedisPool = null;
 
     private static final String HOST = "127.0.0.1";
 
@@ -63,11 +63,11 @@ public class JedisPooledFactory {
      *
      * @return redisPool
      */
-    public static JedisPoolAbstract getJedisPoolInstance(JedisPoolAbstract... jedisPools) {
+    public static Pool<Jedis> getJedisPoolInstance(Pool<Jedis>... jedisPools) {
         if (jedisPool == null) {
             synchronized (JedisPooledFactory.class) {
                 if (jedisPool == null) {
-                    JedisPoolAbstract tempJedisPool = null;
+                    Pool<Jedis> tempJedisPool = null;
                     if (jedisPools != null && jedisPools.length > 0) {
                         tempJedisPool = jedisPools[0];
                     } else {

server/src/main/java/org/apache/seata/server/storage/redis/store/RedisTransactionStoreManager.java

@@ -54,7 +54,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -500,7 +499,7 @@ public List<GlobalSession> readSortByTimeoutBeginSessions(boolean withBranchSess
         // queryCount
         final long queryCount = Math.min(logQueryLimit, countGlobalSessions);
         try (Jedis jedis = JedisPooledFactory.getJedisInstance()) {
-            Set<String> values = jedis.zrangeByScore(
+            List<String> values = jedis.zrangeByScore(
                     REDIS_SEATA_BEGIN_TRANSACTIONS_KEY, 0, System.currentTimeMillis(), 0, (int) queryCount);
             List<Map<String, String>> rep;
             try (Pipeline pipeline = jedis.pipelined()) {

server/src/main/resources/logback-spring.xml

@@ -155,6 +155,12 @@
         </if>
 
     </root>
+    <logger name="org.apache.kafka" level="WARN" additivity="false">
+        <appender-ref ref="ASYNC_CONSOLE"/>
+        <appender-ref ref="ASYNC_FILE_ALL"/>
+        <appender-ref ref="ASYNC_FILE_WARN"/>
+        <appender-ref ref="ASYNC_FILE_ERROR"/>
+    </logger>
     <logger name="org.springframework.security.config.annotation.web.builders.WebSecurity" level="ERROR"/>
     <logger name="org.springframework.security.web.DefaultSecurityFilterChain" level="ERROR"/>
 </configuration>

server/src/test/java/org/apache/seata/server/LoaderConfTest.java

@@ -16,12 +16,13 @@
  */
 package org.apache.seata.server;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.env.Environment;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 /**
  *
  */
@@ -42,10 +43,10 @@ public static void initSessionManager(ApplicationContext context) throws Excepti
     @Test
     public void checkConf() {
         String nacosServerAddr = environment.resolveRequiredPlaceholders("${seata.config.nacos.serverAddr:localhost}");
-        Assertions.assertEquals(nacosServerAddr, "127.0.0.1:8848");
+        assertEquals("127.0.0.1:8848", nacosServerAddr);
         String nacosNamespace = environment.resolveRequiredPlaceholders("${seata.config.nacos.namespace:seata-group}");
-        Assertions.assertEquals(nacosNamespace, "seata-test");
+        assertEquals("seata-test", nacosNamespace);
         String undologSaveDays = environment.resolveRequiredPlaceholders("${seata.server.undo.log-save-days:7}");
-        Assertions.assertEquals(undologSaveDays, "2");
+        assertEquals("2", undologSaveDays);
     }
 }

server/src/test/java/org/apache/seata/server/console/impl/db/BranchSessionDBServiceImplTest.java

@@ -24,8 +24,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import javax.sql.DataSource;
@@ -49,7 +49,7 @@ class BranchSessionDBServiceImplTest extends BaseSpringBootTest {
     @Autowired
     private BranchSessionDBServiceImpl branchSessionDBService;
 
-    @MockBean
+    @MockitoBean
     private DataSource dataSource;
 
     private Connection connection;

server/src/test/java/org/apache/seata/server/console/impl/db/GlobalLockDBServiceImplTest.java

@@ -27,8 +27,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import javax.sql.DataSource;
@@ -52,7 +52,7 @@ class GlobalLockDBServiceImplTest extends BaseSpringBootTest {
     @Autowired
     private GlobalLockDBServiceImpl globalLockDBService;
 
-    @MockBean
+    @MockitoBean
     private DataSource dataSource;
 
     private Connection connection;