diff --git a/dubbo-config/dubbo-config-api/pom.xml b/dubbo-config/dubbo-config-api/pom.xml
index ebf9fac6a89..f95174a466b 100644
--- a/dubbo-config/dubbo-config-api/pom.xml
+++ b/dubbo-config/dubbo-config-api/pom.xml
@@ -237,7 +237,7 @@
org.testcontainers
testcontainers
- 1.20.2
+ 1.20.3
test
diff --git a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml
index 581c88309f0..42ead1a9ef5 100644
--- a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml
+++ b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml
@@ -152,7 +152,7 @@
ch.qos.logback
logback-core
- 1.5.11
+ 1.5.12
compile
diff --git a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml
index e9a8e8c6e3e..89179809c19 100644
--- a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml
+++ b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml
@@ -152,7 +152,7 @@
ch.qos.logback
logback-core
- 1.5.11
+ 1.5.12
compile
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 68af8ec55cf..916e2fe2188 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -90,9 +90,9 @@
5.3.39
- 5.8.14
+ 5.8.15
3.30.2-GA
- 1.15.5
+ 1.15.7
3.2.10.Final
4.1.114.Final
0.0.28.Final
@@ -154,8 +154,8 @@
4.0.23
- 5.11.2
- 1.11.2
+ 5.11.3
+ 1.11.3
4.13.2
4.2.2
2.2
@@ -166,7 +166,7 @@
2.2.7
1.2.0
- 1.20.2
+ 1.20.3
4.0.3
1.6.14
diff --git a/dubbo-maven-plugin/pom.xml b/dubbo-maven-plugin/pom.xml
index 1cceffbaaa8..d7a6a781fa1 100644
--- a/dubbo-maven-plugin/pom.xml
+++ b/dubbo-maven-plugin/pom.xml
@@ -56,7 +56,7 @@
org.apache.maven.plugin-tools
maven-plugin-annotations
- 3.15.0
+ 3.15.1
provided
@@ -111,7 +111,7 @@
org.apache.maven.plugins
maven-plugin-plugin
- 3.15.0
+ 3.15.1
dubbo
diff --git a/dubbo-plugin/dubbo-rest-jaxrs/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/support/jaxrs/JaxrsRequestMappingResolver.java b/dubbo-plugin/dubbo-rest-jaxrs/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/support/jaxrs/JaxrsRequestMappingResolver.java
index f9fc66768eb..acf619d7b2a 100644
--- a/dubbo-plugin/dubbo-rest-jaxrs/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/support/jaxrs/JaxrsRequestMappingResolver.java
+++ b/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;
diff --git a/dubbo-rpc/dubbo-rpc-triple/src/test/groovy/org/apache/dubbo/rpc/protocol/tri/rest/mapping/RadixTreeTest.groovy b/dubbo-rpc/dubbo-rpc-triple/src/test/groovy/org/apache/dubbo/rpc/protocol/tri/rest/mapping/RadixTreeTest.groovy
index 4966e7b7ab4..37cbb35c9ce 100644
--- a/dubbo-rpc/dubbo-rpc-triple/src/test/groovy/org/apache/dubbo/rpc/protocol/tri/rest/mapping/RadixTreeTest.groovy
+++ b/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'
diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2SerializerFactory.java b/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2SerializerFactory.java
index 71eb60c2f42..f907e164445 100644
--- a/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2SerializerFactory.java
+++ b/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()) {
diff --git a/pom.xml b/pom.xml
index 98c1bf5bbc4..29e9f780eac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@
3.3.1
3.10.1
9.4.56.v20240826
- 3.5.0
+ 3.6.0
0.8.12
1.6.0
3.5.0
@@ -252,7 +252,7 @@
maven-dependency-plugin
- 3.8.0
+ 3.8.1