From 6cd5012399df0befa10f63a9e75f2d9edc6b7af3 Mon Sep 17 00:00:00 2001
From: CritasWang <critas@outlook.com>
Date: Fri, 4 Jul 2025 11:23:30 +0800
Subject: [PATCH 1/3] Bump ratis to 3.2.1

---
 iotdb-core/confignode/pom.xml   |  2 +-
 iotdb-core/consensus/pom.xml    | 16 ++++++++--------
 iotdb-core/datanode/pom.xml     |  4 ++--
 iotdb-core/node-commons/pom.xml |  2 +-
 pom.xml                         | 18 +++++++++---------
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/iotdb-core/confignode/pom.xml b/iotdb-core/confignode/pom.xml
index 37c737618b8b8..abffbbcaf08e5 100644
--- a/iotdb-core/confignode/pom.xml
+++ b/iotdb-core/confignode/pom.xml
@@ -117,7 +117,7 @@
             <artifactId>commons-io</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.ratis</groupId>
+            <groupId>com.timecho.ratis</groupId>
             <artifactId>ratis-common</artifactId>
         </dependency>
         <dependency>
diff --git a/iotdb-core/consensus/pom.xml b/iotdb-core/consensus/pom.xml
index 93a8b888d7a4a..a0d9f27801058 100644
--- a/iotdb-core/consensus/pom.xml
+++ b/iotdb-core/consensus/pom.xml
@@ -67,35 +67,35 @@
             <version>2.0.5-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.ratis</groupId>
+            <groupId>com.timecho.ratis</groupId>
             <artifactId>ratis-server</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.ratis</groupId>
+            <groupId>com.timecho.ratis</groupId>
             <artifactId>ratis-server-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.ratis</groupId>
+            <groupId>com.timecho.ratis</groupId>
             <artifactId>ratis-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.ratis</groupId>
+            <groupId>com.timecho.ratis</groupId>
             <artifactId>ratis-client</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.ratis</groupId>
+            <groupId>com.timecho.ratis</groupId>
             <artifactId>ratis-grpc</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.ratis</groupId>
+            <groupId>com.timecho.ratis</groupId>
             <artifactId>ratis-proto</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.ratis</groupId>
+            <groupId>com.timecho.ratis</groupId>
             <artifactId>ratis-metrics-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.ratis</groupId>
+            <groupId>com.timecho.ratis</groupId>
             <artifactId>ratis-thirdparty-misc</artifactId>
         </dependency>
         <dependency>
diff --git a/iotdb-core/datanode/pom.xml b/iotdb-core/datanode/pom.xml
index 0a4d9418916e1..72b43aa976a1d 100644
--- a/iotdb-core/datanode/pom.xml
+++ b/iotdb-core/datanode/pom.xml
@@ -164,7 +164,7 @@
             <artifactId>netty-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.ratis</groupId>
+            <groupId>com.timecho.ratis</groupId>
             <artifactId>ratis-common</artifactId>
         </dependency>
         <dependency>
@@ -352,7 +352,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.ratis</groupId>
+            <groupId>com.timecho.ratis</groupId>
             <artifactId>ratis-thirdparty-misc</artifactId>
             <scope>runtime</scope>
         </dependency>
diff --git a/iotdb-core/node-commons/pom.xml b/iotdb-core/node-commons/pom.xml
index 7998441539a88..cc2e7a5f90a34 100644
--- a/iotdb-core/node-commons/pom.xml
+++ b/iotdb-core/node-commons/pom.xml
@@ -191,7 +191,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.ratis</groupId>
+            <groupId>com.timecho.ratis</groupId>
             <artifactId>ratis-common</artifactId>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index d7b37da140961..29df5a8ef3212 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,7 +144,7 @@
       is for ensuring the SNAPSHOT will stay available. We should however have the Ratis folks do a
       new release soon, as releasing with this version is more than sub-ideal.
     -->
-        <ratis.version>3.2.0</ratis.version>
+        <ratis.version>3.2.1</ratis.version>
         <reactive-streams.version>1.0.4</reactive-streams.version>
         <reactor-netty.version>1.1.20</reactor-netty.version>
         <reactor.version>3.5.18</reactor.version>
@@ -319,42 +319,42 @@
                 <version>${commons-io.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.ratis</groupId>
+                <groupId>com.timecho.ratis</groupId>
                 <artifactId>ratis-server</artifactId>
                 <version>${ratis.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.ratis</groupId>
+                <groupId>com.timecho.ratis</groupId>
                 <artifactId>ratis-server-api</artifactId>
                 <version>${ratis.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.ratis</groupId>
+                <groupId>com.timecho.ratis</groupId>
                 <artifactId>ratis-common</artifactId>
                 <version>${ratis.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.ratis</groupId>
+                <groupId>com.timecho.ratis</groupId>
                 <artifactId>ratis-client</artifactId>
                 <version>${ratis.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.ratis</groupId>
+                <groupId>com.timecho.ratis</groupId>
                 <artifactId>ratis-grpc</artifactId>
                 <version>${ratis.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.ratis</groupId>
+                <groupId>com.timecho.ratis</groupId>
                 <artifactId>ratis-proto</artifactId>
                 <version>${ratis.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.ratis</groupId>
+                <groupId>com.timecho.ratis</groupId>
                 <artifactId>ratis-metrics-api</artifactId>
                 <version>${ratis.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.ratis</groupId>
+                <groupId>com.timecho.ratis</groupId>
                 <artifactId>ratis-thirdparty-misc</artifactId>
                 <version>${ratis-thirdparty-misc.version}</version>
             </dependency>

From a7e46b518845362e047482cd215bdf0f5fcc8df6 Mon Sep 17 00:00:00 2001
From: CritasWang <critas@outlook.com>
Date: Fri, 4 Jul 2025 11:26:06 +0800
Subject: [PATCH 2/3] keep ratis-thirdparty-misc use org.apache

---
 iotdb-core/consensus/pom.xml | 2 +-
 iotdb-core/datanode/pom.xml  | 2 +-
 pom.xml                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/iotdb-core/consensus/pom.xml b/iotdb-core/consensus/pom.xml
index a0d9f27801058..5280b94468cf5 100644
--- a/iotdb-core/consensus/pom.xml
+++ b/iotdb-core/consensus/pom.xml
@@ -95,7 +95,7 @@
             <artifactId>ratis-metrics-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.timecho.ratis</groupId>
+            <groupId>org.apache.ratis</groupId>
             <artifactId>ratis-thirdparty-misc</artifactId>
         </dependency>
         <dependency>
diff --git a/iotdb-core/datanode/pom.xml b/iotdb-core/datanode/pom.xml
index 72b43aa976a1d..f1cd4a4fe46f5 100644
--- a/iotdb-core/datanode/pom.xml
+++ b/iotdb-core/datanode/pom.xml
@@ -352,7 +352,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.timecho.ratis</groupId>
+            <groupId>org.apache.ratis</groupId>
             <artifactId>ratis-thirdparty-misc</artifactId>
             <scope>runtime</scope>
         </dependency>
diff --git a/pom.xml b/pom.xml
index 29df5a8ef3212..1fa9a6e8eb128 100644
--- a/pom.xml
+++ b/pom.xml
@@ -354,7 +354,7 @@
                 <version>${ratis.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.timecho.ratis</groupId>
+                <groupId>org.apache.ratis</groupId>
                 <artifactId>ratis-thirdparty-misc</artifactId>
                 <version>${ratis-thirdparty-misc.version}</version>
             </dependency>

From 2b3e3e67ad50c9eae3526e2fbda0c56de6127340 Mon Sep 17 00:00:00 2001
From: CritasWang <critas@outlook.com>
Date: Fri, 4 Jul 2025 11:29:02 +0800
Subject: [PATCH 3/3] fix dependencies

---
 dependencies.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dependencies.json b/dependencies.json
index 2e121a3144403..1f8f06da726a3 100644
--- a/dependencies.json
+++ b/dependencies.json
@@ -95,13 +95,13 @@
         "org.apache.commons:commons-pool2",
         "org.apache.httpcomponents:httpclient",
         "org.apache.httpcomponents:httpcore",
-        "org.apache.ratis:ratis-client",
-        "org.apache.ratis:ratis-common",
-        "org.apache.ratis:ratis-grpc",
-        "org.apache.ratis:ratis-metrics-api",
-        "org.apache.ratis:ratis-proto",
-        "org.apache.ratis:ratis-server",
-        "org.apache.ratis:ratis-server-api",
+        "com.timecho.ratis:ratis-client",
+        "com.timecho.ratis:ratis-common",
+        "com.timecho.ratis:ratis-grpc",
+        "com.timecho.ratis:ratis-metrics-api",
+        "com.timecho.ratis:ratis-proto",
+        "com.timecho.ratis:ratis-server",
+        "com.timecho.ratis:ratis-server-api",
         "org.apache.ratis:ratis-thirdparty-misc",
         "org.apache.thrift:libthrift",
         "org.apache.tsfile:common",