From 0a0687e8dcb562109a3040ce2c9b4690cad2ab89 Mon Sep 17 00:00:00 2001
From: Albumen Kevin <jhq0812@gmail.com>
Date: Mon, 28 Oct 2024 15:13:40 +0800
Subject: [PATCH 1/3] Prepare 3.3.2 release

---
 dubbo-dependencies-bom/pom.xml                                  | 2 +-
 .../dubbo-dependencies-zookeeper-curator5/pom.xml               | 2 +-
 dubbo-plugin/dubbo-rest-jaxrs/pom.xml                           | 2 +-
 dubbo-plugin/dubbo-rest-spring/pom.xml                          | 2 +-
 pom.xml                                                         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 8e022abac12..68af8ec55cf 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -188,7 +188,7 @@
     <jakarta.xml.bind-api.version>4.0.2</jakarta.xml.bind-api.version>
     <jaxb-runtime.version>2.4.0-b180830.0438</jaxb-runtime.version>
 
-    <revision>3.3.2-SNAPSHOT</revision>
+    <revision>3.3.2</revision>
   </properties>
 
   <dependencyManagement>
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
index 40795e00a34..df10dc777fe 100644
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
@@ -39,7 +39,7 @@
     <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
     <palantirJavaFormat.version>2.38.0</palantirJavaFormat.version>
 
-    <revision>3.3.2-SNAPSHOT</revision>
+    <revision>3.3.2</revision>
   </properties>
 
   <dependencies>
diff --git a/dubbo-plugin/dubbo-rest-jaxrs/pom.xml b/dubbo-plugin/dubbo-rest-jaxrs/pom.xml
index 6682a1f6c57..3ed872edf0a 100644
--- a/dubbo-plugin/dubbo-rest-jaxrs/pom.xml
+++ b/dubbo-plugin/dubbo-rest-jaxrs/pom.xml
@@ -104,7 +104,7 @@
         <dependency>
           <groupId>org.apache.dubbo</groupId>
           <artifactId>dubbo-rpc-rest</artifactId>
-          <version>3.3.2-SNAPSHOT</version>
+          <version>3.3.2</version>
           <scope>test</scope>
         </dependency>
       </dependencies>
diff --git a/dubbo-plugin/dubbo-rest-spring/pom.xml b/dubbo-plugin/dubbo-rest-spring/pom.xml
index 61fa5752d5f..5ebf95bad5c 100644
--- a/dubbo-plugin/dubbo-rest-spring/pom.xml
+++ b/dubbo-plugin/dubbo-rest-spring/pom.xml
@@ -113,7 +113,7 @@
         <dependency>
           <groupId>org.apache.dubbo</groupId>
           <artifactId>dubbo-rpc-rest</artifactId>
-          <version>3.3.2-SNAPSHOT</version>
+          <version>3.3.2</version>
           <scope>test</scope>
         </dependency>
       </dependencies>
diff --git a/pom.xml b/pom.xml
index dc7be436f8f..98c1bf5bbc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,7 +149,7 @@
     <spotless.action>check</spotless.action>
     <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
     <palantirJavaFormat.version>2.38.0</palantirJavaFormat.version>
-    <revision>3.3.2-SNAPSHOT</revision>
+    <revision>3.3.2</revision>
   </properties>
 
   <dependencyManagement>

From 3e3211109a7ba54be973fc2a86c6ace5bce8e25f Mon Sep 17 00:00:00 2001
From: Albumen Kevin <jhq0812@gmail.com>
Date: Fri, 3 Jan 2025 16:34:34 +0800
Subject: [PATCH 2/3] Fix TelnetCodecTest in Windows (#15033)

---
 .../java/org/apache/dubbo/remoting/codec/TelnetCodecTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/TelnetCodecTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/TelnetCodecTest.java
index bdcbc4a9c92..e0e06642892 100644
--- a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/TelnetCodecTest.java
+++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/TelnetCodecTest.java
@@ -29,6 +29,7 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -75,7 +76,7 @@ protected byte[] join(byte[] in1, byte[] in2) {
     protected byte[] objectToByte(Object obj) {
         byte[] bytes;
         if (obj instanceof String) {
-            bytes = ((String) obj).getBytes();
+            bytes = ((String) obj).getBytes(StandardCharsets.UTF_8);
         } else if (obj instanceof byte[]) {
             bytes = (byte[]) obj;
         } else {

From 577a4158c409e43aa556466b267eb019624b395f Mon Sep 17 00:00:00 2001
From: Albumen Kevin <jhq0812@gmail.com>
Date: Fri, 3 Jan 2025 17:04:29 +0800
Subject: [PATCH 3/3] Fix dubbo-compiler import

---
 dubbo-rpc/dubbo-rpc-triple/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dubbo-rpc/dubbo-rpc-triple/pom.xml b/dubbo-rpc/dubbo-rpc-triple/pom.xml
index 1b4bebf035c..5d0a0140c4c 100644
--- a/dubbo-rpc/dubbo-rpc-triple/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-triple/pom.xml
@@ -123,6 +123,12 @@
       <artifactId>spock-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.dubbo</groupId>
+      <artifactId>dubbo-compiler</artifactId>
+      <version>${project.parent.version}</version>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
   <build>
     <plugins>