feat: support springboot3.x

wardseptember · wardseptember · commit da70f71ce881 · 2025-04-16T15:12:01.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -94,7 +94,7 @@
         <maven.compiler.version>3.7.0</maven.compiler.version>
         <maven.gpg.version>3.1.0</maven.gpg.version>
         <maven.ignore.testfailure>false</maven.ignore.testfailure>
-        <maven.surefire.version>2.22.0</maven.surefire.version>
+        <maven.surefire.version>3.0.0-M7</maven.surefire.version>
         <maven.javadoc.version>3.0.1</maven.javadoc.version>
         <exec.maven.version>3.1.0</exec.maven.version>
         <file.encoding>UTF-8</file.encoding>
@@ -121,25 +121,44 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.9.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.9.3</version>
             <scope>test</scope>
         </dependency>
+        <!-- 保留 JUnit 4 测试 -->
         <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-support</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4-rule</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.powermock</groupId>-->
+<!--            <artifactId>powermock-module-junit4</artifactId>-->
+<!--            <scope>test</scope>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.powermock</groupId>-->
+<!--            <artifactId>powermock-api-mockito2</artifactId>-->
+<!--            <scope>test</scope>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.powermock</groupId>-->
+<!--            <artifactId>powermock-api-support</artifactId>-->
+<!--            <scope>test</scope>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.powermock</groupId>-->
+<!--            <artifactId>powermock-module-junit4-rule</artifactId>-->
+<!--            <scope>test</scope>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.jacoco</groupId>
             <artifactId>org.jacoco.agent</artifactId>
@@ -176,6 +195,10 @@
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>${maven.surefire.version}</version>
                     <configuration>
+                        <argLine>
+                            --add-opens java.base/java.lang=ALL-UNNAMED
+                            --add-opens java.base/java.util=ALL-UNNAMED
+                        </argLine>
                         <testFailureIgnore>${maven.ignore.testfailure}</testFailureIgnore>
                         <skipTests>false</skipTests>
                         <systemPropertyVariables>
diff --git a/trpc-dependencies/trpc-dependencies-bom/pom.xml b/trpc-dependencies/trpc-dependencies-bom/pom.xml
@@ -48,10 +48,11 @@
         <httpcore5.version>5.2.1</httpcore5.version>
         <hutool.all.version>5.8.28</hutool.all.version>
         <jackson.version>2.15.0-rc2</jackson.version>
+        <jakarta.servlet.version>6.0.0</jakarta.servlet.version>
         <javax.ws.rs.version>2.1.1</javax.ws.rs.version>
         <javax.validation.version>2.0.1.Final</javax.validation.version>
         <jetty.alpn.boot.version>8.1.13.v20181017</jetty.alpn.boot.version>
-        <jetty.version>9.4.55.v20240627</jetty.version>
+        <jetty.version>11.0.25</jetty.version>
         <joda-time.version>2.7</joda-time.version>
         <jprotobuf.version>2.4.14</jprotobuf.version>
         <junit.version>4.13.2</junit.version>
@@ -72,7 +73,7 @@
         <maven.plugin.testing.harness.version>3.3.0</maven.plugin.testing.harness.version>
         <maven.resolver.version>1.4.1</maven.resolver.version>
         <metrics.version>3.0.2</metrics.version>
-        <mockito_core.version>1.10.19</mockito_core.version>
+        <mockito_core.version>5.3.1</mockito_core.version>
         <nacos.version>1.4.2</nacos.version>
         <nacos.client.version>2.2.1</nacos.client.version>
         <objenesis.version>2.4</objenesis.version>
@@ -85,21 +86,22 @@
         <opentelemetry.bom.version>1.26.0</opentelemetry.bom.version>
         <okio.version>3.4.0</okio.version>
         <polaris.open.version>1.15.5</polaris.open.version>
-        <powermock.version>1.7.4</powermock.version>
+        <powermock.version>2.0.9</powermock.version>
         <protobuf-bom.version>3.25.5</protobuf-bom.version>
         <pgv.version>0.4.1</pgv.version>
         <pgv.bin.version>0.6.13</pgv.bin.version>
         <quasar.version>0.7.9</quasar.version>
         <reflections.version>0.9.12</reflections.version>
         <resteasy.version>5.0.6.Final</resteasy.version>
+
         <sentinel-transport-simple-http.version>1.8.6</sentinel-transport-simple-http.version>
         <sentinel.version>1.8.6</sentinel.version>
         <slf4j.version>1.7.36</slf4j.version>
         <snakeyaml.version>2.0</snakeyaml.version>
         <snappy.version>1.1.10.4</snappy.version>
-        <spring.version>5.3.27</spring.version>
-        <springboot.version>2.7.12</springboot.version>
-        <spring.cloud.gateway.version>3.1.5</spring.cloud.gateway.version>
+        <spring.version>6.2.2</spring.version>
+        <springboot.version>3.4.2</springboot.version>
+        <spring.cloud.gateway.version>4.2.1</spring.cloud.gateway.version>
         <transmittable.version>2.12.4</transmittable.version>
         <zookeeper.version>3.8.4</zookeeper.version>
 
@@ -743,7 +745,7 @@
             </dependency>
             <dependency>
                 <groupId>org.powermock</groupId>
-                <artifactId>powermock-api-mockito</artifactId>
+                <artifactId>powermock-api-mockito2</artifactId>
                 <version>${powermock.version}</version>
                 <scope>test</scope>
                 <exclusions>
@@ -921,6 +923,11 @@
                 <artifactId>validation-api</artifactId>
                 <version>${javax.validation.version}</version>
             </dependency>
+            <dependency>
+                <groupId>jakarta.servlet</groupId>
+                <artifactId>jakarta.servlet-api</artifactId>
+                <version>${jakarta.servlet.version}</version>
+            </dependency>
             <!--dependencies bom end-->
         </dependencies>
     </dependencyManagement>
diff --git a/trpc-proto/trpc-proto-http/pom.xml b/trpc-proto/trpc-proto-http/pom.xml
@@ -60,5 +60,9 @@
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/common/ErrorResponse.java b/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/common/ErrorResponse.java
@@ -14,7 +14,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
 import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 
 /**
diff --git a/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/common/HttpCodec.java b/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/common/HttpCodec.java
@@ -24,9 +24,9 @@
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.http.HttpHeaders;
 
diff --git a/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/common/TrpcServletRequestWrapper.java b/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/common/TrpcServletRequestWrapper.java
@@ -13,8 +13,8 @@
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 
 /**
  * The HTTP requests encapsulated by TRPC cannot be serialized.
diff --git a/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/common/TrpcServletResponseWrapper.java b/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/common/TrpcServletResponseWrapper.java
@@ -13,8 +13,8 @@
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 
 /**
  * The HTTP responses encapsulated by TRPC cannot be serialized.
diff --git a/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/server/AbstractHttpExecutor.java b/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/server/AbstractHttpExecutor.java
@@ -46,8 +46,8 @@
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 
diff --git a/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/server/DefaultHttpExecutor.java b/trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/server/DefaultHttpExecutor.java
@@ -25,8 +25,8 @@
 import com.tencent.trpc.proto.http.common.HttpConstants;
 import com.tencent.trpc.transport.http.HttpExecutor;
 import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 
diff --git a/trpc-spring-support/trpc-springmvc/src/main/java/com/tencent/trpc/springmvc/TRpcHandlerAdapter.java b/trpc-spring-support/trpc-springmvc/src/main/java/com/tencent/trpc/springmvc/TRpcHandlerAdapter.java
@@ -15,8 +15,8 @@
 import com.tencent.trpc.core.exception.TRpcException;
 import com.tencent.trpc.core.rpc.common.RpcMethodInfoAndInvoker;
 import com.tencent.trpc.proto.http.server.AbstractHttpExecutor;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.web.servlet.HandlerAdapter;
diff --git a/trpc-spring-support/trpc-springmvc/src/main/java/com/tencent/trpc/springmvc/TRpcHttpCodec.java b/trpc-spring-support/trpc-springmvc/src/main/java/com/tencent/trpc/springmvc/TRpcHttpCodec.java
@@ -12,7 +12,7 @@
 package com.tencent.trpc.springmvc;
 
 import com.tencent.trpc.proto.http.common.HttpCodec;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public class TRpcHttpCodec extends HttpCodec {
 
diff --git a/trpc-spring-support/trpc-springmvc/src/main/java/com/tencent/trpc/springmvc/TRpcServiceHandlerMapping.java b/trpc-spring-support/trpc-springmvc/src/main/java/com/tencent/trpc/springmvc/TRpcServiceHandlerMapping.java
@@ -25,7 +25,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.atomic.AtomicBoolean;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.core.Ordered;
diff --git a/trpc-transport/trpc-transport-http/pom.xml b/trpc-transport/trpc-transport-http/pom.xml
@@ -71,6 +71,10 @@
             <artifactId>httpclient</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
 
     </dependencies>
 
diff --git a/trpc-transport/trpc-transport-http/src/main/java/com/tencent/trpc/transport/http/ExecutorDispatcher.java b/trpc-transport/trpc-transport-http/src/main/java/com/tencent/trpc/transport/http/ExecutorDispatcher.java
@@ -14,10 +14,10 @@
 import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 public class ExecutorDispatcher extends HttpServlet {
 
diff --git a/trpc-transport/trpc-transport-http/src/main/java/com/tencent/trpc/transport/http/HttpExecutor.java b/trpc-transport/trpc-transport-http/src/main/java/com/tencent/trpc/transport/http/HttpExecutor.java
@@ -12,9 +12,9 @@
 package com.tencent.trpc.transport.http;
 
 import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 
 /**
diff --git a/trpc-transport/trpc-transport-http/src/main/java/com/tencent/trpc/transport/http/common/ServletManager.java b/trpc-transport/trpc-transport-http/src/main/java/com/tencent/trpc/transport/http/common/ServletManager.java
@@ -30,7 +30,7 @@
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 /**
  * Utility class used to manage {@link ServletContext}s.
diff --git a/trpc-transport/trpc-transport-http/src/main/java/com/tencent/trpc/transport/http/support/jetty/JettyHttp2Server.java b/trpc-transport/trpc-transport-http/src/main/java/com/tencent/trpc/transport/http/support/jetty/JettyHttp2Server.java
@@ -43,7 +43,7 @@ public JettyHttp2Server(ProtocolConfig config, HttpExecutor executor) {
 
     @Override
     protected ServerConnector buildServerConnector(Server server, ProtocolConfig config,
-            SslContextFactory sslContextFactory, HttpConfiguration httpConfig,
+            SslContextFactory.Server sslContextFactory, HttpConfiguration httpConfig,
             HttpConfiguration httpsConfig) {
         // 1. Config the h2 factory
         HTTP2ServerConnectionFactory h2 = new HTTP2ServerConnectionFactory(httpsConfig);
diff --git a/trpc-transport/trpc-transport-http/src/main/java/com/tencent/trpc/transport/http/support/jetty/JettyHttpsServer.java b/trpc-transport/trpc-transport-http/src/main/java/com/tencent/trpc/transport/http/support/jetty/JettyHttpsServer.java
@@ -26,7 +26,6 @@
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.SslConnectionFactory;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
-import org.eclipse.jetty.util.ssl.SslContextFactory.Client;
 
 
 /**
@@ -50,7 +49,7 @@ public ServerConnector getServerConnector(Server server) {
         ProtocolConfig config = getConfig();
 
         // 1. Configure SSL certificate, which uses TLS by default and is suitable for HTTPS and h2.
-        SslContextFactory sslContextFactory = new Client();
+        SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
         sslContextFactory.setKeyStorePath(String.valueOf(config.getExtMap().get(KEYSTORE_PATH)));
         sslContextFactory
                 .setKeyStorePassword(String.valueOf(config.getExtMap().get(KEYSTORE_PASS)));
@@ -82,7 +81,7 @@ public ServerConnector getServerConnector(Server server) {
      * @return the Jetty's {@link ServerConnector}
      */
     protected ServerConnector buildServerConnector(Server server, ProtocolConfig config,
-            SslContextFactory sslContextFactory, HttpConfiguration httpConfig,
+            SslContextFactory.Server sslContextFactory, HttpConfiguration httpConfig,
             HttpConfiguration httpsConfig) {
         // 1. Configure ssl factory
         SslConnectionFactory ssl = new SslConnectionFactory(sslContextFactory, HTTP1_SCHEME);
