Merge branch 'refs/heads/apache-3.3' into 3.3.2-release

dubbo-config/dubbo-config-api/pom.xml

@@ -237,7 +237,7 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>testcontainers</artifactId>
-      <version>1.20.2</version>
+      <version>1.20.3</version>
       <scope>test</scope>
     </dependency>
 

dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml

@@ -152,7 +152,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-core</artifactId>
-      <version>1.5.11</version>
+      <version>1.5.12</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml

@@ -152,7 +152,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-core</artifactId>
-      <version>1.5.11</version>
+      <version>1.5.12</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

dubbo-dependencies-bom/pom.xml

@@ -90,9 +90,9 @@
     <!-- Common libs -->
     <!-- <spring_version>4.3.30.RELEASE</spring_version> -->
     <spring_version>5.3.39</spring_version>
-    <spring_security_version>5.8.14</spring_security_version>
+    <spring_security_version>5.8.15</spring_security_version>
     <javassist_version>3.30.2-GA</javassist_version>
-    <byte-buddy_version>1.15.5</byte-buddy_version>
+    <byte-buddy_version>1.15.7</byte-buddy_version>
     <netty_version>3.2.10.Final</netty_version>
     <netty4_version>4.1.114.Final</netty4_version>
     <netty_http3_version>0.0.28.Final</netty_http3_version>
@@ -154,8 +154,8 @@
     <groovy_version>4.0.23</groovy_version>
 
     <!-- Test libs -->
-    <junit_jupiter_version>5.11.2</junit_jupiter_version>
-    <junit_platform_version>1.11.2</junit_platform_version>
+    <junit_jupiter_version>5.11.3</junit_jupiter_version>
+    <junit_platform_version>1.11.3</junit_platform_version>
     <junit_version>4.13.2</junit_version>
     <awaitility_version>4.2.2</awaitility_version>
     <hamcrest_version>2.2</hamcrest_version>
@@ -166,7 +166,7 @@
 
     <jaxb_version>2.2.7</jaxb_version>
     <activation_version>1.2.0</activation_version>
-    <test_container_version>1.20.2</test_container_version>
+    <test_container_version>1.20.3</test_container_version>
     <hessian_lite_version>4.0.3</hessian_lite_version>
     <swagger_version>1.6.14</swagger_version>
 

dubbo-maven-plugin/pom.xml

@@ -56,7 +56,7 @@
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.15.0</version>
+      <version>3.15.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -111,7 +111,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.15.0</version>
+        <version>3.15.1</version>
         <configuration>
           <goalPrefix>dubbo</goalPrefix>
         </configuration>

dubbo-plugin/dubbo-rest-jaxrs/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/support/jaxrs/JaxrsRequestMappingResolver.java

@@ -29,7 +29,7 @@
 import org.apache.dubbo.rpc.protocol.tri.rest.mapping.meta.ServiceMeta;
 import org.apache.dubbo.rpc.protocol.tri.rest.util.RestToolKit;
 
-@Activate(onClass = "javax.ws.rs.Path")
+@Activate(onClass = {"javax.ws.rs.Path", "javax.ws.rs.container.ContainerRequestContext"})
 public class JaxrsRequestMappingResolver implements RequestMappingResolver {
 
     private final FrameworkModel frameworkModel;

dubbo-rpc/dubbo-rpc-triple/src/test/groovy/org/apache/dubbo/rpc/protocol/tri/rest/mapping/RadixTreeTest.groovy

@@ -65,7 +65,7 @@ class RadixTreeTest extends Specification {
             tree.addPath("/update/{ruleId}", "a")
             tree.addPath("/update/{ruleId}/state", "b")
         expect:
-            tree.match(path).first.value == result
+            tree.match(path).get(0).value == result
         where:
             path                    | result
             '/update/1222222'       | 'a'

dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2SerializerFactory.java

@@ -67,6 +67,10 @@ protected Serializer getDefaultSerializer(Class cl) {
 
     @Override
     protected Deserializer getDefaultDeserializer(Class cl) {
+        if (InputStream.class.equals(cl)) {
+            return InputStreamDeserializer.DESER;
+        }
+
         try {
             // pre-check if class is allow
             defaultSerializeClassChecker.loadClass(getClassLoader(), cl.getName());
@@ -76,9 +80,7 @@ protected Deserializer getDefaultDeserializer(Class cl) {
 
         checkSerializable(cl);
 
-        if (InputStream.class.equals(cl)) {
-            return InputStreamDeserializer.DESER;
-        } else if (RecordUtil.isRecord(cl)) {
+        if (RecordUtil.isRecord(cl)) {
             return new RecordDeserializer(cl, getFieldDeserializerFactory());
         } else {
             if (isEnableUnsafeSerializer()) {

pom.xml

@@ -134,7 +134,7 @@
     <maven_source_version>3.3.1</maven_source_version>
     <maven_javadoc_version>3.10.1</maven_javadoc_version>
     <maven_jetty_version>9.4.56.v20240826</maven_jetty_version>
-    <maven_checkstyle_version>3.5.0</maven_checkstyle_version>
+    <maven_checkstyle_version>3.6.0</maven_checkstyle_version>
     <maven_jacoco_version>0.8.12</maven_jacoco_version>
     <maven_flatten_version>1.6.0</maven_flatten_version>
     <maven_enforce_version>3.5.0</maven_enforce_version>
@@ -252,7 +252,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.8.0</version>
+          <version>3.8.1</version>
         </plugin>
         <plugin>
           <!-- Do NOT upgrade -->