This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch rc/2.0.4 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 80e271735dfc2cd029d5b37ead08f87118f164b9 Author: Jackie Tien <[email protected]> AuthorDate: Thu May 22 16:20:31 2025 +0800 [To rc/2.0.3] Change ratis dependency from org.apache.ratis to com.timecho.ratis --- dependencies.json | 14 +++++++------- docker/src/main/Dockerfile-1c1d | 2 +- iotdb-core/confignode/pom.xml | 2 +- iotdb-core/consensus/pom.xml | 14 +++++++------- iotdb-core/datanode/pom.xml | 2 +- iotdb-core/node-commons/pom.xml | 2 +- pom.xml | 16 ++++++++-------- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dependencies.json b/dependencies.json index 2e121a31444..1f8f06da726 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", diff --git a/docker/src/main/Dockerfile-1c1d b/docker/src/main/Dockerfile-1c1d index 9a5605c1f2b..edce666ebbe 100644 --- a/docker/src/main/Dockerfile-1c1d +++ b/docker/src/main/Dockerfile-1c1d @@ -42,7 +42,7 @@ RUN apt update \ && apt purge --auto-remove -y \ && apt clean -y \ RUN dos2unix /iotdb/sbin/start-1c1d.sh -RUN dos2unix /iotdb/sbin/../conf/iotdb-common.sh +RUN dos2unix /iotdb/sbin/iotdb-common.sh RUN dos2unix /iotdb/sbin/start-confignode.sh RUN dos2unix /iotdb/sbin/../conf/confignode-env.sh RUN dos2unix /iotdb/sbin/stop-confignode.sh diff --git a/iotdb-core/confignode/pom.xml b/iotdb-core/confignode/pom.xml index 79d21cfad44..bd56975ad7d 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 bd4f077f56f..ba1c6cfeb03 100644 --- a/iotdb-core/consensus/pom.xml +++ b/iotdb-core/consensus/pom.xml @@ -67,31 +67,31 @@ <version>2.0.4</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> diff --git a/iotdb-core/datanode/pom.xml b/iotdb-core/datanode/pom.xml index cb15f3d3fc1..df44c4be0d3 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> diff --git a/iotdb-core/node-commons/pom.xml b/iotdb-core/node-commons/pom.xml index 9751fb3797d..60919ff8b87 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 55f404ba432..3a192c2e757 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-3247c7f-SNAPSHOT</ratis.version> + <ratis.version>3.2.0</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,37 +319,37 @@ <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>
