This is an automated email from the ASF dual-hosted git repository.
earthchen pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.3 by this push:
new be40746485 Bump protobuf-java from 3.25.8 to 4.33.4 and remove guava
dependency by rewriting CodecTest with java.nio.charset.StandardCharsets
(#16026)
be40746485 is described below
commit be40746485db9bf2b13d1b6860d05ba0fae71c24
Author: zrlw <[email protected]>
AuthorDate: Fri Jan 23 16:47:16 2026 +0800
Bump protobuf-java from 3.25.8 to 4.33.4 and remove guava dependency by
rewriting CodecTest with java.nio.charset.StandardCharsets (#16026)
---
dubbo-dependencies-bom/pom.xml | 2 +-
dubbo-maven-plugin/pom.xml | 4 ++--
.../org/apache/dubbo/remoting/http12/message/codec/CodecTest.java | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 306b4eb173..402de81684 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -104,7 +104,7 @@
<curator_version>5.9.0</curator_version>
<curator_test_version>2.12.0</curator_test_version>
<hessian_version>4.0.66</hessian_version>
- <protobuf-java_version>3.25.8</protobuf-java_version>
+ <protobuf-java_version>4.33.4</protobuf-java_version>
<jsr305_version>3.0.2</jsr305_version>
<javax_annotation-api_version>1.3.2</javax_annotation-api_version>
<servlet_version>3.1.0</servlet_version>
diff --git a/dubbo-maven-plugin/pom.xml b/dubbo-maven-plugin/pom.xml
index ef477d1be5..ad99e6ebb2 100644
--- a/dubbo-maven-plugin/pom.xml
+++ b/dubbo-maven-plugin/pom.xml
@@ -29,8 +29,8 @@
<properties>
<dubbo.version>${revision}</dubbo.version>
- <protobuf-java.version>3.25.5</protobuf-java.version>
- <!--<protobuf-java.version>3.24.3</protobuf-java.version>-->
+ <!-- the protobuf-java version should be same with the version defined at
dubbo-dependencies-bom -->
+ <protobuf-java.version>4.33.4</protobuf-java.version>
</properties>
<dependencies>
diff --git
a/dubbo-remoting/dubbo-remoting-http12/src/test/java/org/apache/dubbo/remoting/http12/message/codec/CodecTest.java
b/dubbo-remoting/dubbo-remoting-http12/src/test/java/org/apache/dubbo/remoting/http12/message/codec/CodecTest.java
index 43f76abb4a..9568b85ba3 100644
---
a/dubbo-remoting/dubbo-remoting-http12/src/test/java/org/apache/dubbo/remoting/http12/message/codec/CodecTest.java
+++
b/dubbo-remoting/dubbo-remoting-http12/src/test/java/org/apache/dubbo/remoting/http12/message/codec/CodecTest.java
@@ -22,8 +22,8 @@ import org.apache.dubbo.rpc.model.FrameworkModel;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
-import com.google.common.base.Charsets;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -76,11 +76,11 @@ public class CodecTest {
in = new ByteArrayInputStream(utf8Bytes);
codec = PlainTextCodec.INSTANCE;
- res = (String) codec.decode(in, String.class, Charsets.UTF_8);
+ res = (String) codec.decode(in, String.class, StandardCharsets.UTF_8);
Assertions.assertEquals("你好,世界", res);
in = new ByteArrayInputStream(utf16Bytes);
- res = (String) codec.decode(in, String.class, Charsets.UTF_16);
+ res = (String) codec.decode(in, String.class, StandardCharsets.UTF_16);
Assertions.assertEquals("你好,世界", res);
}
}