diff --git a/.github/workflows/iotdb-tools-thrift-artifacts.yml b/.github/workflows/iotdb-tools-thrift-artifacts.yml index f76456f..7521ce4 100644 --- a/.github/workflows/iotdb-tools-thrift-artifacts.yml +++ b/.github/workflows/iotdb-tools-thrift-artifacts.yml @@ -142,7 +142,11 @@ jobs: $archive.Dispose() } - $expectedBinary = if ($classifier.StartsWith("windows")) { "bin/Release/thrift.exe" } else { "bin/thrift" } + $expectedBinary = if ($classifier.StartsWith("windows")) { + "bin/Release/thrift.exe" + } else { + "bin/thrift" + } Write-Host "Archive: $($zip.Name)" $files | ForEach-Object { Write-Host " - $_" } @@ -170,7 +174,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/.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 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..c4cdcc6 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. --> - 0.23.0.0 + 0.25.0.0 pom IoTDB-Tools: Thrift Local build of the Apache Thrift compiler. - 0.23.0 + 0.25.0 Unix Makefiles Release ${project.build.directory}/prebuilt-artifacts @@ -76,8 +76,11 @@ - com.googlecode.cmake-maven-project + io.github.cmake-maven-plugin cmake-maven-plugin + + true + @@ -89,7 +92,7 @@ ${cmake.generator} ${project.build.directory}/thrift-${thrift.version} - ${project.build.directory}/build + ${project.build.directory}/build @@ -202,9 +205,9 @@ 1.7.1 - com.googlecode.cmake-maven-project + io.github.cmake-maven-plugin cmake-maven-plugin - 3.29.3-b2 + 4.2.3-b1 org.codehaus.mojo @@ -273,7 +276,7 @@ - com.googlecode.cmake-maven-project + io.github.cmake-maven-plugin cmake-maven-plugin @@ -286,7 +289,7 @@ ${cmake.generator} ${project.build.directory}/thrift-${thrift.version} - ${project.build.directory}/build + ${project.build.directory}/build @@ -316,7 +319,7 @@ - com.googlecode.cmake-maven-project + io.github.cmake-maven-plugin cmake-maven-plugin @@ -329,7 +332,7 @@ ${cmake.generator} ${project.build.directory}/thrift-${thrift.version} - ${project.build.directory}/build + ${project.build.directory}/build @@ -358,7 +361,7 @@ - com.googlecode.cmake-maven-project + io.github.cmake-maven-plugin cmake-maven-plugin @@ -371,7 +374,7 @@ ${cmake.generator} ${project.build.directory}/thrift-${thrift.version} - ${project.build.directory}/build + ${project.build.directory}/build @@ -398,7 +401,7 @@ - com.googlecode.cmake-maven-project + io.github.cmake-maven-plugin cmake-maven-plugin @@ -411,7 +414,7 @@ ${cmake.generator} ${project.build.directory}/thrift-${thrift.version} - ${project.build.directory}/build + ${project.build.directory}/build @@ -449,9 +452,20 @@ windows-aarch64 - - Visual Studio 17 2022 + Visual Studio 18 2026 + + + + io.github.cmake-maven-plugin + cmake-maven-plugin + + + false + + + + @@ -469,7 +483,7 @@ - com.googlecode.cmake-maven-project + io.github.cmake-maven-plugin cmake-maven-plugin