Skip to content

Commit 3438707

Browse files
committed
Merge branch 'refs/heads/apache-3.3' into 3.3.2-release
2 parents 0a0687e + b7fcd9a commit 3438707

File tree

9 files changed

+19
-17
lines changed

9 files changed

+19
-17
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@
237237
<dependency>
238238
<groupId>org.testcontainers</groupId>
239239
<artifactId>testcontainers</artifactId>
240-
<version>1.20.2</version>
240+
<version>1.20.3</version>
241241
<scope>test</scope>
242242
</dependency>
243243

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<dependency>
153153
<groupId>ch.qos.logback</groupId>
154154
<artifactId>logback-core</artifactId>
155-
<version>1.5.11</version>
155+
<version>1.5.12</version>
156156
<scope>compile</scope>
157157
</dependency>
158158
</dependencies>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<dependency>
153153
<groupId>ch.qos.logback</groupId>
154154
<artifactId>logback-core</artifactId>
155-
<version>1.5.11</version>
155+
<version>1.5.12</version>
156156
<scope>compile</scope>
157157
</dependency>
158158
</dependencies>

dubbo-dependencies-bom/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@
9090
<!-- Common libs -->
9191
<!-- <spring_version>4.3.30.RELEASE</spring_version> -->
9292
<spring_version>5.3.39</spring_version>
93-
<spring_security_version>5.8.14</spring_security_version>
93+
<spring_security_version>5.8.15</spring_security_version>
9494
<javassist_version>3.30.2-GA</javassist_version>
95-
<byte-buddy_version>1.15.5</byte-buddy_version>
95+
<byte-buddy_version>1.15.7</byte-buddy_version>
9696
<netty_version>3.2.10.Final</netty_version>
9797
<netty4_version>4.1.114.Final</netty4_version>
9898
<netty_http3_version>0.0.28.Final</netty_http3_version>
@@ -154,8 +154,8 @@
154154
<groovy_version>4.0.23</groovy_version>
155155

156156
<!-- Test libs -->
157-
<junit_jupiter_version>5.11.2</junit_jupiter_version>
158-
<junit_platform_version>1.11.2</junit_platform_version>
157+
<junit_jupiter_version>5.11.3</junit_jupiter_version>
158+
<junit_platform_version>1.11.3</junit_platform_version>
159159
<junit_version>4.13.2</junit_version>
160160
<awaitility_version>4.2.2</awaitility_version>
161161
<hamcrest_version>2.2</hamcrest_version>
@@ -166,7 +166,7 @@
166166

167167
<jaxb_version>2.2.7</jaxb_version>
168168
<activation_version>1.2.0</activation_version>
169-
<test_container_version>1.20.2</test_container_version>
169+
<test_container_version>1.20.3</test_container_version>
170170
<hessian_lite_version>4.0.3</hessian_lite_version>
171171
<swagger_version>1.6.14</swagger_version>
172172

dubbo-maven-plugin/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<dependency>
5757
<groupId>org.apache.maven.plugin-tools</groupId>
5858
<artifactId>maven-plugin-annotations</artifactId>
59-
<version>3.15.0</version>
59+
<version>3.15.1</version>
6060
<scope>provided</scope>
6161
</dependency>
6262

@@ -111,7 +111,7 @@
111111
<plugin>
112112
<groupId>org.apache.maven.plugins</groupId>
113113
<artifactId>maven-plugin-plugin</artifactId>
114-
<version>3.15.0</version>
114+
<version>3.15.1</version>
115115
<configuration>
116116
<goalPrefix>dubbo</goalPrefix>
117117
</configuration>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.apache.dubbo.rpc.protocol.tri.rest.mapping.meta.ServiceMeta;
3030
import org.apache.dubbo.rpc.protocol.tri.rest.util.RestToolKit;
3131

32-
@Activate(onClass = "javax.ws.rs.Path")
32+
@Activate(onClass = {"javax.ws.rs.Path", "javax.ws.rs.container.ContainerRequestContext"})
3333
public class JaxrsRequestMappingResolver implements RequestMappingResolver {
3434

3535
private final FrameworkModel frameworkModel;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class RadixTreeTest extends Specification {
6565
tree.addPath("/update/{ruleId}", "a")
6666
tree.addPath("/update/{ruleId}/state", "b")
6767
expect:
68-
tree.match(path).first.value == result
68+
tree.match(path).get(0).value == result
6969
where:
7070
path | result
7171
'/update/1222222' | 'a'

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ protected Serializer getDefaultSerializer(Class cl) {
6767

6868
@Override
6969
protected Deserializer getDefaultDeserializer(Class cl) {
70+
if (InputStream.class.equals(cl)) {
71+
return InputStreamDeserializer.DESER;
72+
}
73+
7074
try {
7175
// pre-check if class is allow
7276
defaultSerializeClassChecker.loadClass(getClassLoader(), cl.getName());
@@ -76,9 +80,7 @@ protected Deserializer getDefaultDeserializer(Class cl) {
7680

7781
checkSerializable(cl);
7882

79-
if (InputStream.class.equals(cl)) {
80-
return InputStreamDeserializer.DESER;
81-
} else if (RecordUtil.isRecord(cl)) {
83+
if (RecordUtil.isRecord(cl)) {
8284
return new RecordDeserializer(cl, getFieldDeserializerFactory());
8385
} else {
8486
if (isEnableUnsafeSerializer()) {

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
<maven_source_version>3.3.1</maven_source_version>
135135
<maven_javadoc_version>3.10.1</maven_javadoc_version>
136136
<maven_jetty_version>9.4.56.v20240826</maven_jetty_version>
137-
<maven_checkstyle_version>3.5.0</maven_checkstyle_version>
137+
<maven_checkstyle_version>3.6.0</maven_checkstyle_version>
138138
<maven_jacoco_version>0.8.12</maven_jacoco_version>
139139
<maven_flatten_version>1.6.0</maven_flatten_version>
140140
<maven_enforce_version>3.5.0</maven_enforce_version>
@@ -252,7 +252,7 @@
252252
</plugin>
253253
<plugin>
254254
<artifactId>maven-dependency-plugin</artifactId>
255-
<version>3.8.0</version>
255+
<version>3.8.1</version>
256256
</plugin>
257257
<plugin>
258258
<!-- Do NOT upgrade -->

0 commit comments

Comments
 (0)