From de1795eaa196f37ee4c2ce85a7c9f4edd4d0e75b Mon Sep 17 00:00:00 2001
From: HTHou <haonan@apache.org>
Date: Sat, 3 Oct 2026 19:45:10 +0800
Subject: [PATCH 1/4] Release thrift 0.25.0 tool

---
 .github/workflows/iotdb-tools-thrift-artifacts.yml | 2 +-
 iotdb-tools-thrift/README.md                       | 2 +-
 iotdb-tools-thrift/README_zh.md                    | 2 +-
 iotdb-tools-thrift/pom.xml                         | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/iotdb-tools-thrift-artifacts.yml b/.github/workflows/iotdb-tools-thrift-artifacts.yml
index f76456f..89dfbc6 100644
--- a/.github/workflows/iotdb-tools-thrift-artifacts.yml
+++ b/.github/workflows/iotdb-tools-thrift-artifacts.yml
@@ -170,7 +170,7 @@ jobs:
           }
           $version = ($version | Select-Object -Last 1).Trim()
           Write-Host "Thrift version output: $version"
-          if ($version -ne "Thrift version 0.23.0") {
+          if ($version -ne "Thrift version 0.25.0") {
             throw "Unexpected thrift version output: $version"
           }
 
diff --git a/iotdb-tools-thrift/README.md b/iotdb-tools-thrift/README.md
index 02f0cbe..45d0ddf 100644
--- a/iotdb-tools-thrift/README.md
+++ b/iotdb-tools-thrift/README.md
@@ -76,7 +76,7 @@ The directory must contain these files:
 - `iotdb-tools-thrift-${project.version}-windows-x86_64.zip`
 - `iotdb-tools-thrift-${project.version}-windows-aarch64.zip`
 
-`${project.version}` is the Maven project version, for example `0.23.0.0`.
+`${project.version}` is the Maven project version, for example `0.25.0.0`.
 
 Verify the archives before deploying them. Each archive should contain only the
 `bin/thrift` executable, or `bin/Release/thrift.exe` on Windows, and the
diff --git a/iotdb-tools-thrift/README_zh.md b/iotdb-tools-thrift/README_zh.md
index 849ac6a..405e693 100644
--- a/iotdb-tools-thrift/README_zh.md
+++ b/iotdb-tools-thrift/README_zh.md
@@ -75,7 +75,7 @@ workflow 会上传一个名为 `iotdb-tools-thrift-all-platforms` 的汇总 arti
 - `iotdb-tools-thrift-${project.version}-windows-x86_64.zip`
 - `iotdb-tools-thrift-${project.version}-windows-aarch64.zip`
 
-`${project.version}` 是 Maven 项目版本，例如 `0.23.0.0`。
+`${project.version}` 是 Maven 项目版本，例如 `0.25.0.0`。
 
 deploy 前请先检查这些压缩包。每个压缩包应当只包含 `bin/thrift` 可执行文件，
 Windows 平台为 `bin/Release/thrift.exe`，并且该可执行文件输出的 Apache
diff --git a/iotdb-tools-thrift/pom.xml b/iotdb-tools-thrift/pom.xml
index 1200575..248ebd6 100644
--- a/iotdb-tools-thrift/pom.xml
+++ b/iotdb-tools-thrift/pom.xml
@@ -33,14 +33,14 @@
         contains nothing else as the compiled thrift binary without any modification.
         The fourth segment allows us to re-deploy, if we need to change the config.
     -->
-    <version>0.23.0.0</version>
+    <version>0.25.0.0</version>
     <packaging>pom</packaging>
 
     <name>IoTDB-Tools: Thrift</name>
     <description>Local build of the Apache Thrift compiler.</description>
 
     <properties>
-        <thrift.version>0.23.0</thrift.version>
+        <thrift.version>0.25.0</thrift.version>
         <cmake.generator>Unix Makefiles</cmake.generator>
         <cmake.build.type>Release</cmake.build.type>
         <prebuilt.artifacts.dir>${project.build.directory}/prebuilt-artifacts</prebuilt.artifacts.dir>

From 521b507bc6f72a2a5000e9edbc87b3f3fd9939f8 Mon Sep 17 00:00:00 2001
From: HTHou <haonan@apache.org>
Date: Sat, 3 Oct 2026 19:49:19 +0800
Subject: [PATCH 2/4] Support Thrift builds on Windows ARM runners

---
 .github/workflows/iotdb-tools-thrift-artifacts.yml | 8 +++++++-
 iotdb-tools-thrift/README.md                       | 5 +++--
 iotdb-tools-thrift/README_zh.md                    | 6 +++---
 iotdb-tools-thrift/pom.xml                         | 4 ++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/iotdb-tools-thrift-artifacts.yml b/.github/workflows/iotdb-tools-thrift-artifacts.yml
index 89dfbc6..a5c5428 100644
--- a/.github/workflows/iotdb-tools-thrift-artifacts.yml
+++ b/.github/workflows/iotdb-tools-thrift-artifacts.yml
@@ -142,7 +142,13 @@ jobs:
             $archive.Dispose()
           }
 
-          $expectedBinary = if ($classifier.StartsWith("windows")) { "bin/Release/thrift.exe" } else { "bin/thrift" }
+          $expectedBinary = if ($classifier -eq "windows-x86_64") {
+            "bin/Release/thrift.exe"
+          } elseif ($classifier -eq "windows-aarch64") {
+            "bin/thrift.exe"
+          } else {
+            "bin/thrift"
+          }
           Write-Host "Archive: $($zip.Name)"
           $files | ForEach-Object { Write-Host " - $_" }
 
diff --git a/iotdb-tools-thrift/README.md b/iotdb-tools-thrift/README.md
index 45d0ddf..c43dafb 100644
--- a/iotdb-tools-thrift/README.md
+++ b/iotdb-tools-thrift/README.md
@@ -79,8 +79,9 @@ The directory must contain these files:
 `${project.version}` is the Maven project version, for example `0.25.0.0`.
 
 Verify the archives before deploying them. Each archive should contain only the
-`bin/thrift` executable, or `bin/Release/thrift.exe` on Windows, and the
-executable should report the expected Apache Thrift version.
+`bin/thrift` executable, `bin/Release/thrift.exe` on Windows x86_64, or
+`bin/thrift.exe` on Windows ARM64, and the executable should report the expected
+Apache Thrift version.
 
 ## Deploy Prebuilt Artifacts to Nexus
 
diff --git a/iotdb-tools-thrift/README_zh.md b/iotdb-tools-thrift/README_zh.md
index 405e693..ffbbc6a 100644
--- a/iotdb-tools-thrift/README_zh.md
+++ b/iotdb-tools-thrift/README_zh.md
@@ -77,9 +77,9 @@ workflow 会上传一个名为 `iotdb-tools-thrift-all-platforms` 的汇总 arti
 
 `${project.version}` 是 Maven 项目版本，例如 `0.25.0.0`。
 
-deploy 前请先检查这些压缩包。每个压缩包应当只包含 `bin/thrift` 可执行文件，
-Windows 平台为 `bin/Release/thrift.exe`，并且该可执行文件输出的 Apache
-Thrift 版本符合预期。
+deploy 前请先检查这些压缩包。每个压缩包应当只包含 `bin/thrift` 可执行文件；
+Windows x86_64 平台为 `bin/Release/thrift.exe`，Windows ARM64 平台为
+`bin/thrift.exe`。该可执行文件输出的 Apache Thrift 版本应符合预期。
 
 ## 将预构建 artifacts 发布到 Nexus
 
diff --git a/iotdb-tools-thrift/pom.xml b/iotdb-tools-thrift/pom.xml
index 248ebd6..91a7495 100644
--- a/iotdb-tools-thrift/pom.xml
+++ b/iotdb-tools-thrift/pom.xml
@@ -449,8 +449,8 @@
             </activation>
             <properties>
                 <os.classifier>windows-aarch64</os.classifier>
-                <!-- We're using Mingw everywhere else, but it seems boost is not supported for that -->
-                <cmake.generator>Visual Studio 17 2022</cmake.generator>
+                <!-- The GitHub-hosted Windows ARM runner provides LLVM and Ninja, but not Visual Studio. -->
+                <cmake.generator>Ninja</cmake.generator>
             </properties>
         </profile>
 

From eb8a9474332a12e44e24289abcb76cdd4221d134 Mon Sep 17 00:00:00 2001
From: HTHou <haonan@apache.org>
Date: Sat, 3 Oct 2026 19:57:13 +0800
Subject: [PATCH 3/4] Build Windows ARM artifacts with Visual Studio 2026

---
 .../iotdb-tools-thrift-artifacts.yml          |  4 +--
 .../.mvn/wrapper/maven-wrapper.properties     |  2 +-
 iotdb-tools-thrift/README.md                  |  5 ++-
 iotdb-tools-thrift/README_zh.md               |  6 ++--
 iotdb-tools-thrift/pom.xml                    | 32 ++++++++++---------
 5 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/iotdb-tools-thrift-artifacts.yml b/.github/workflows/iotdb-tools-thrift-artifacts.yml
index a5c5428..7521ce4 100644
--- a/.github/workflows/iotdb-tools-thrift-artifacts.yml
+++ b/.github/workflows/iotdb-tools-thrift-artifacts.yml
@@ -142,10 +142,8 @@ jobs:
             $archive.Dispose()
           }
 
-          $expectedBinary = if ($classifier -eq "windows-x86_64") {
+          $expectedBinary = if ($classifier.StartsWith("windows")) {
             "bin/Release/thrift.exe"
-          } elseif ($classifier -eq "windows-aarch64") {
-            "bin/thrift.exe"
           } else {
             "bin/thrift"
           }
diff --git a/iotdb-tools-thrift/.mvn/wrapper/maven-wrapper.properties b/iotdb-tools-thrift/.mvn/wrapper/maven-wrapper.properties
index f3a46ae..d58ddb0 100644
--- a/iotdb-tools-thrift/.mvn/wrapper/maven-wrapper.properties
+++ b/iotdb-tools-thrift/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
diff --git a/iotdb-tools-thrift/README.md b/iotdb-tools-thrift/README.md
index c43dafb..45d0ddf 100644
--- a/iotdb-tools-thrift/README.md
+++ b/iotdb-tools-thrift/README.md
@@ -79,9 +79,8 @@ The directory must contain these files:
 `${project.version}` is the Maven project version, for example `0.25.0.0`.
 
 Verify the archives before deploying them. Each archive should contain only the
-`bin/thrift` executable, `bin/Release/thrift.exe` on Windows x86_64, or
-`bin/thrift.exe` on Windows ARM64, and the executable should report the expected
-Apache Thrift version.
+`bin/thrift` executable, or `bin/Release/thrift.exe` on Windows, and the
+executable should report the expected Apache Thrift version.
 
 ## Deploy Prebuilt Artifacts to Nexus
 
diff --git a/iotdb-tools-thrift/README_zh.md b/iotdb-tools-thrift/README_zh.md
index ffbbc6a..405e693 100644
--- a/iotdb-tools-thrift/README_zh.md
+++ b/iotdb-tools-thrift/README_zh.md
@@ -77,9 +77,9 @@ workflow 会上传一个名为 `iotdb-tools-thrift-all-platforms` 的汇总 arti
 
 `${project.version}` 是 Maven 项目版本，例如 `0.25.0.0`。
 
-deploy 前请先检查这些压缩包。每个压缩包应当只包含 `bin/thrift` 可执行文件；
-Windows x86_64 平台为 `bin/Release/thrift.exe`，Windows ARM64 平台为
-`bin/thrift.exe`。该可执行文件输出的 Apache Thrift 版本应符合预期。
+deploy 前请先检查这些压缩包。每个压缩包应当只包含 `bin/thrift` 可执行文件，
+Windows 平台为 `bin/Release/thrift.exe`，并且该可执行文件输出的 Apache
+Thrift 版本符合预期。
 
 ## 将预构建 artifacts 发布到 Nexus
 
diff --git a/iotdb-tools-thrift/pom.xml b/iotdb-tools-thrift/pom.xml
index 91a7495..0cde1da 100644
--- a/iotdb-tools-thrift/pom.xml
+++ b/iotdb-tools-thrift/pom.xml
@@ -76,8 +76,11 @@
             </plugin>
 
             <plugin>
-                <groupId>com.googlecode.cmake-maven-project</groupId>
+                <groupId>io.github.cmake-maven-plugin</groupId>
                 <artifactId>cmake-maven-plugin</artifactId>
+                <configuration>
+                    <downloadBinaries>true</downloadBinaries>
+                </configuration>
                 <executions>
                     <!-- Uses a CMake generator to generate the build using the build tool of choice -->
                     <execution>
@@ -89,7 +92,7 @@
                         <configuration>
                             <generator>${cmake.generator}</generator>
                             <sourcePath>${project.build.directory}/thrift-${thrift.version}</sourcePath>
-                            <targetPath>${project.build.directory}/build</targetPath>
+                            <projectDirectory>${project.build.directory}/build</projectDirectory>
                             <options>
                                 <!-- Disable testing for now -->
                                 <option>-DBUILD_TESTING=OFF</option>
@@ -202,9 +205,9 @@
                     <version>1.7.1</version>
                 </plugin>
                 <plugin>
-                    <groupId>com.googlecode.cmake-maven-project</groupId>
+                    <groupId>io.github.cmake-maven-plugin</groupId>
                     <artifactId>cmake-maven-plugin</artifactId>
-                    <version>3.29.3-b2</version>
+                    <version>4.2.3-b1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -273,7 +276,7 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>com.googlecode.cmake-maven-project</groupId>
+                        <groupId>io.github.cmake-maven-plugin</groupId>
                         <artifactId>cmake-maven-plugin</artifactId>
                         <executions>
                             <!-- Uses a CMake generator to generate the build using the build tool of choice -->
@@ -286,7 +289,7 @@
                                 <configuration>
                                     <generator>${cmake.generator}</generator>
                                     <sourcePath>${project.build.directory}/thrift-${thrift.version}</sourcePath>
-                                    <targetPath>${project.build.directory}/build</targetPath>
+                                    <projectDirectory>${project.build.directory}/build</projectDirectory>
                                     <options combine.children="append">
                                         <!-- Tell the linker to build statically linked binaries -->
                                         <option>-DCMAKE_EXE_LINKER_FLAGS=-static</option>
@@ -316,7 +319,7 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>com.googlecode.cmake-maven-project</groupId>
+                        <groupId>io.github.cmake-maven-plugin</groupId>
                         <artifactId>cmake-maven-plugin</artifactId>
                         <executions>
                             <!-- Uses a CMake generator to generate the build using the build tool of choice -->
@@ -329,7 +332,7 @@
                                 <configuration>
                                     <generator>${cmake.generator}</generator>
                                     <sourcePath>${project.build.directory}/thrift-${thrift.version}</sourcePath>
-                                    <targetPath>${project.build.directory}/build</targetPath>
+                                    <projectDirectory>${project.build.directory}/build</projectDirectory>
                                     <options combine.children="append">
                                         <!-- Tell the linker to build statically linked binaries -->
                                         <option>-DCMAKE_EXE_LINKER_FLAGS=-static</option>
@@ -358,7 +361,7 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>com.googlecode.cmake-maven-project</groupId>
+                        <groupId>io.github.cmake-maven-plugin</groupId>
                         <artifactId>cmake-maven-plugin</artifactId>
                         <executions>
                             <!-- Uses a CMake generator to generate the build using the build tool of choice -->
@@ -371,7 +374,7 @@
                                 <configuration>
                                     <generator>${cmake.generator}</generator>
                                     <sourcePath>${project.build.directory}/thrift-${thrift.version}</sourcePath>
-                                    <targetPath>${project.build.directory}/build</targetPath>
+                                    <projectDirectory>${project.build.directory}/build</projectDirectory>
                                     <options combine.children="append">
                                         <!-- Specify new version Bison path for Mac-OS, as the default version is too old -->
                                         <option>-DBISON_EXECUTABLE=/usr/local/opt/bison/bin/bison</option>
@@ -398,7 +401,7 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>com.googlecode.cmake-maven-project</groupId>
+                        <groupId>io.github.cmake-maven-plugin</groupId>
                         <artifactId>cmake-maven-plugin</artifactId>
                         <executions>
                             <!-- Uses a CMake generator to generate the build using the build tool of choice -->
@@ -411,7 +414,7 @@
                                 <configuration>
                                     <generator>${cmake.generator}</generator>
                                     <sourcePath>${project.build.directory}/thrift-${thrift.version}</sourcePath>
-                                    <targetPath>${project.build.directory}/build</targetPath>
+                                    <projectDirectory>${project.build.directory}/build</projectDirectory>
                                     <options combine.children="append">
                                         <!-- Specify new version Bison path for Mac-OS, as the default version is too old -->
                                         <option>-DBISON_EXECUTABLE=/opt/homebrew/opt/bison/bin/bison</option>
@@ -449,8 +452,7 @@
             </activation>
             <properties>
                 <os.classifier>windows-aarch64</os.classifier>
-                <!-- The GitHub-hosted Windows ARM runner provides LLVM and Ninja, but not Visual Studio. -->
-                <cmake.generator>Ninja</cmake.generator>
+                <cmake.generator>Visual Studio 18 2026</cmake.generator>
             </properties>
         </profile>
 
@@ -469,7 +471,7 @@
                         </executions>
                     </plugin>
                     <plugin>
-                        <groupId>com.googlecode.cmake-maven-project</groupId>
+                        <groupId>io.github.cmake-maven-plugin</groupId>
                         <artifactId>cmake-maven-plugin</artifactId>
                         <executions>
                             <execution>

From fc5159e4eae1d5efad5a32dd4df225be945b7e71 Mon Sep 17 00:00:00 2001
From: HTHou <haonan@apache.org>
Date: Sat, 3 Oct 2026 20:01:52 +0800
Subject: [PATCH 4/4] Use runner CMake for Windows ARM

---
 iotdb-tools-thrift/pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/iotdb-tools-thrift/pom.xml b/iotdb-tools-thrift/pom.xml
index 0cde1da..c4cdcc6 100644
--- a/iotdb-tools-thrift/pom.xml
+++ b/iotdb-tools-thrift/pom.xml
@@ -454,6 +454,18 @@
                 <os.classifier>windows-aarch64</os.classifier>
                 <cmake.generator>Visual Studio 18 2026</cmake.generator>
             </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.github.cmake-maven-plugin</groupId>
+                        <artifactId>cmake-maven-plugin</artifactId>
+                        <configuration>
+                            <!-- CMake does not publish Windows ARM64 binaries; use the runner's CMake. -->
+                            <downloadBinaries>false</downloadBinaries>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
 
         <profile>