This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch rc/2.0.6 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit d241ae66823e76633d8514fe09abddbfde4eae11 Author: Jiang Tian <[email protected]> AuthorDate: Wed Nov 26 09:35:54 2025 +0800 Bump ratis to apache 3.2.1 (#16801) * Bump ratis to apache 3.2.1 * fix (cherry picked from commit 1c6a2b02ab9473c1e3e38214317b4d398707021b) --- dependencies.json | 335 ++++++++++++++++++++-------------------- 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 | 14 +- 6 files changed, 186 insertions(+), 183 deletions(-) diff --git a/dependencies.json b/dependencies.json index 1f8f06da726..6553a8dfe3e 100644 --- a/dependencies.json +++ b/dependencies.json @@ -1,168 +1,171 @@ { - "dependencies": [ - "cglib:cglib", - "ch.qos.logback:logback-classic", - "ch.qos.logback:logback-core", - "ch.qos.reload4j:reload4j", - "com.digitalpetri.fsm:strict-machine", - "com.digitalpetri.netty:netty-channel-fsm", - "com.fasterxml.jackson.core:jackson-annotations", - "com.fasterxml.jackson.core:jackson-core", - "com.fasterxml.jackson.core:jackson-databind", - "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", - "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", - "com.fasterxml.jackson.jaxrs:jackson-jaxrs-base", - "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider", - "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", - "com.github.ben-manes.caffeine:caffeine", - "com.github.luben:zstd-jni", - "com.github.stephenc.jcip:jcip-annotations", - "com.github.wendykierp:JTransforms", - "com.google.code.findbugs:jsr305", - "com.google.code.gson:gson", - "com.google.errorprone:error_prone_annotations", - "com.google.guava:failureaccess", - "com.google.guava:guava", - "com.google.guava:listenablefuture", - "com.google.j2objc:j2objc-annotations", - "com.h2database:h2-mvstore", - "com.lmax:disruptor", - "com.nimbusds:content-type", - "com.nimbusds:lang-tag", - "com.nimbusds:nimbus-jose-jwt", - "com.nimbusds:oauth2-oidc-sdk", - "com.sun.istack:istack-commons-runtime", - "com.zaxxer:HikariCP", - "commons-cli:commons-cli", - "commons-codec:commons-codec", - "commons-io:commons-io", - "commons-logging:commons-logging", - "io.airlift:airline", - "io.airlift:concurrent", - "io.airlift:log", - "io.airlift:units", - "io.dropwizard.metrics:metrics-core", - "io.jsonwebtoken:jjwt-api", - "io.micrometer:micrometer-commons", - "io.micrometer:micrometer-core", - "io.micrometer:micrometer-observation", - "com.github.moquette-io.moquette:moquette-broker", - "io.netty:netty-buffer", - "io.netty:netty-codec", - "io.netty:netty-codec-dns", - "io.netty:netty-codec-http", - "io.netty:netty-codec-http2", - "io.netty:netty-codec-mqtt", - "io.netty:netty-codec-socks", - "io.netty:netty-common", - "io.netty:netty-handler", - "io.netty:netty-handler-proxy", - "io.netty:netty-resolver", - "io.netty:netty-resolver-dns", - "io.netty:netty-resolver-dns-classes-macos", - "io.netty:netty-resolver-dns-native-macos", - "io.netty:netty-tcnative-boringssl-static", - "io.netty:netty-tcnative-classes", - "io.netty:netty-transport", - "io.netty:netty-transport-classes-epoll", - "io.netty:netty-transport-native-epoll", - "io.netty:netty-transport-native-unix-common", - "io.netty:netty-transport-classes-kqueue", - "io.netty:netty-transport-native-kqueue", - "io.projectreactor:reactor-core", - "io.projectreactor.netty:reactor-netty-core", - "io.projectreactor.netty:reactor-netty-http", - "io.swagger:swagger-annotations", - "io.swagger:swagger-core", - "io.swagger:swagger-jaxrs", - "io.swagger:swagger-models", - "jakarta.activation:jakarta.activation-api", - "jakarta.annotation:jakarta.annotation-api", - "jakarta.servlet:jakarta.servlet-api", - "jakarta.validation:jakarta.validation-api", - "jakarta.ws.rs:jakarta.ws.rs-api", - "jakarta.xml.bind:jakarta.xml.bind-api", - "net.java.dev.jna:jna", - "net.java.dev.jna:jna-platform", - "net.minidev:accessors-smart", - "net.minidev:json-smart", - "org.antlr:antlr4-runtime", - "org.apache.commons:commons-collections4", - "org.apache.commons:commons-csv", - "org.apache.commons:commons-jexl3", - "org.apache.commons:commons-lang3", - "org.apache.commons:commons-math3", - "org.apache.commons:commons-pool2", - "org.apache.httpcomponents:httpclient", - "org.apache.httpcomponents:httpcore", - "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", - "org.apache.tsfile:tsfile", - "org.bouncycastle:bcpkix-jdk18on", - "org.bouncycastle:bcprov-jdk18on", - "org.bouncycastle:bcutil-jdk18on", - "org.checkerframework:checker-qual", - "org.eclipse.collections:eclipse-collections", - "org.eclipse.collections:eclipse-collections-api", - "org.eclipse.jetty:jetty-http", - "org.eclipse.jetty:jetty-io", - "org.eclipse.jetty:jetty-security", - "org.eclipse.jetty:jetty-server", - "org.eclipse.jetty:jetty-servlet", - "org.eclipse.jetty:jetty-util", - "org.eclipse.jetty:jetty-util-ajax", - "org.eclipse.milo:bsd-core", - "org.eclipse.milo:bsd-generator", - "org.eclipse.milo:sdk-client", - "org.eclipse.milo:sdk-core", - "org.eclipse.milo:sdk-server", - "org.eclipse.milo:stack-client", - "org.eclipse.milo:stack-core", - "org.eclipse.milo:stack-server", - "org.fusesource.hawtbuf:hawtbuf", - "org.fusesource.hawtdispatch:hawtdispatch", - "org.fusesource.hawtdispatch:hawtdispatch-transport", - "org.fusesource.mqtt-client:mqtt-client", - "org.glassfish.hk2:hk2-api", - "org.glassfish.hk2:hk2-locator", - "org.glassfish.hk2:hk2-utils", - "org.glassfish.hk2:osgi-resource-locator", - "org.glassfish.hk2.external:aopalliance-repackaged", - "org.glassfish.hk2.external:jakarta.inject", - "org.glassfish.jaxb:jaxb-runtime", - "org.glassfish.jaxb:txw2", - "org.glassfish.jersey.containers:jersey-container-servlet-core", - "org.glassfish.jersey.core:jersey-client", - "org.glassfish.jersey.core:jersey-common", - "org.glassfish.jersey.core:jersey-server", - "org.glassfish.jersey.inject:jersey-hk2", - "org.glassfish.jersey.media:jersey-media-multipart", - "org.hdrhistogram:HdrHistogram", - "org.java-websocket:Java-WebSocket", - "org.javassist:javassist", - "org.jline:jline", - "org.jvnet.mimepull:mimepull", - "org.latencyutils:LatencyUtils", - "org.lz4:lz4-java", - "org.ops4j.pax.jdbc:pax-jdbc-common", - "org.osgi:osgi.cmpn", - "org.osgi:osgi.core", - "org.ow2.asm:asm", - "org.reactivestreams:reactive-streams", - "org.reflections:reflections", - "org.slf4j:slf4j-api", - "org.slf4j:slf4j-reload4j", - "org.tukaani:xz", - "org.xerial.snappy:snappy-java", - "org.yaml:snakeyaml", - "pl.edu.icm:JLargeArrays" - ] + "dependencies": [ + "cglib:cglib", + "ch.qos.logback:logback-classic", + "ch.qos.logback:logback-core", + "ch.qos.reload4j:reload4j", + "com.digitalpetri.fsm:strict-machine", + "com.digitalpetri.netty:netty-channel-fsm", + "com.fasterxml.jackson.core:jackson-annotations", + "com.fasterxml.jackson.core:jackson-core", + "com.fasterxml.jackson.core:jackson-databind", + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-base", + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider", + "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", + "com.github.ben-manes.caffeine:caffeine", + "com.github.luben:zstd-jni", + "com.github.moquette-io.moquette:moquette-broker", + "com.github.stephenc.jcip:jcip-annotations", + "com.github.wendykierp:JTransforms", + "com.google.code.findbugs:jsr305", + "com.google.code.gson:gson", + "com.google.errorprone:error_prone_annotations", + "com.google.guava:failureaccess", + "com.google.guava:guava", + "com.google.guava:listenablefuture", + "com.google.j2objc:j2objc-annotations", + "com.h2database:h2-mvstore", + "com.nimbusds:content-type", + "com.nimbusds:lang-tag", + "com.nimbusds:nimbus-jose-jwt", + "com.nimbusds:oauth2-oidc-sdk", + "com.sun.istack:istack-commons-runtime", + "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.zaxxer:HikariCP", + "commons-cli:commons-cli", + "commons-codec:commons-codec", + "commons-codec:commons-codec", + "commons-logging:commons-logging", + "io.airlift:airline", + "io.airlift:units", + "io.dropwizard.metrics:metrics-core", + "io.jsonwebtoken:jjwt-api", + "io.micrometer:micrometer-commons", + "io.micrometer:micrometer-core", + "io.micrometer:micrometer-observation", + "io.netty:netty-buffer", + "io.netty:netty-codec", + "io.netty:netty-codec-dns", + "io.netty:netty-codec-http", + "io.netty:netty-codec-http2", + "io.netty:netty-codec-mqtt", + "io.netty:netty-codec-socks", + "io.netty:netty-common", + "io.netty:netty-handler", + "io.netty:netty-handler-proxy", + "io.netty:netty-resolver", + "io.netty:netty-resolver-dns", + "io.netty:netty-resolver-dns-classes-macos", + "io.netty:netty-resolver-dns-native-macos", + "io.netty:netty-tcnative-boringssl-static", + "io.netty:netty-tcnative-boringssl-static", + "io.netty:netty-tcnative-boringssl-static", + "io.netty:netty-tcnative-boringssl-static", + "io.netty:netty-tcnative-boringssl-static", + "io.netty:netty-tcnative-classes", + "io.netty:netty-transport", + "io.netty:netty-transport-classes-epoll", + "io.netty:netty-transport-classes-kqueue", + "io.netty:netty-transport-native-epoll", + "io.netty:netty-transport-native-epoll", + "io.netty:netty-transport-native-kqueue", + "io.netty:netty-transport-native-kqueue", + "io.netty:netty-transport-native-unix-common", + "io.projectreactor:reactor-core", + "io.projectreactor.netty:reactor-netty-core", + "io.projectreactor.netty:reactor-netty-http", + "io.swagger:swagger-annotations", + "io.swagger:swagger-core", + "io.swagger:swagger-jaxrs", + "io.swagger:swagger-models", + "jakarta.activation:jakarta.activation-api", + "jakarta.annotation:jakarta.annotation-api", + "jakarta.servlet:jakarta.servlet-api", + "jakarta.validation:jakarta.validation-api", + "jakarta.ws.rs:jakarta.ws.rs-api", + "jakarta.xml.bind:jakarta.xml.bind-api", + "net.java.dev.jna:jna", + "net.java.dev.jna:jna-platform", + "net.minidev:accessors-smart", + "net.minidev:json-smart", + "org.antlr:antlr4-runtime", + "org.apache.commons:commons-csv", + "org.apache.commons:commons-jexl3", + "org.apache.commons:commons-lang3", + "org.apache.commons:commons-lang3", + "org.apache.commons:commons-math3", + "org.apache.commons:commons-pool2", + "org.apache.httpcomponents:httpclient", + "org.apache.httpcomponents:httpcore", + "org.apache.ratis:ratis-thirdparty-misc", + "org.apache.thrift:libthrift", + "org.apache.tsfile:common", + "org.apache.tsfile:tsfile", + "org.bouncycastle:bcpkix-jdk18on", + "org.bouncycastle:bcprov-jdk18on", + "org.bouncycastle:bcutil-jdk18on", + "org.checkerframework:checker-qual", + "org.checkerframework:checker-qual", + "org.eclipse.collections:eclipse-collections", + "org.eclipse.collections:eclipse-collections-api", + "org.eclipse.jetty:jetty-http", + "org.eclipse.jetty:jetty-io", + "org.eclipse.jetty:jetty-security", + "org.eclipse.jetty:jetty-server", + "org.eclipse.jetty:jetty-servlet", + "org.eclipse.jetty:jetty-util", + "org.eclipse.jetty:jetty-util-ajax", + "org.eclipse.milo:bsd-core", + "org.eclipse.milo:bsd-generator", + "org.eclipse.milo:sdk-client", + "org.eclipse.milo:sdk-core", + "org.eclipse.milo:sdk-server", + "org.eclipse.milo:stack-client", + "org.eclipse.milo:stack-core", + "org.eclipse.milo:stack-server", + "org.fusesource.hawtbuf:hawtbuf", + "org.fusesource.hawtdispatch:hawtdispatch", + "org.fusesource.hawtdispatch:hawtdispatch-transport", + "org.fusesource.mqtt-client:mqtt-client", + "org.glassfish.hk2:hk2-api", + "org.glassfish.hk2:hk2-locator", + "org.glassfish.hk2:hk2-utils", + "org.glassfish.hk2:osgi-resource-locator", + "org.glassfish.hk2.external:aopalliance-repackaged", + "org.glassfish.hk2.external:jakarta.inject", + "org.glassfish.jaxb:jaxb-runtime", + "org.glassfish.jaxb:txw2", + "org.glassfish.jersey.containers:jersey-container-servlet-core", + "org.glassfish.jersey.core:jersey-client", + "org.glassfish.jersey.core:jersey-common", + "org.glassfish.jersey.core:jersey-server", + "org.glassfish.jersey.inject:jersey-hk2", + "org.glassfish.jersey.media:jersey-media-multipart", + "org.hdrhistogram:HdrHistogram", + "org.java-websocket:Java-WebSocket", + "org.javassist:javassist", + "org.jline:jline", + "org.jvnet.mimepull:mimepull", + "org.latencyutils:LatencyUtils", + "org.lz4:lz4-java", + "org.ops4j.pax.jdbc:pax-jdbc-common", + "org.osgi:osgi.cmpn", + "org.osgi:osgi.core", + "org.ow2.asm:asm", + "org.reactivestreams:reactive-streams", + "org.slf4j:slf4j-api", + "org.slf4j:slf4j-reload4j", + "org.tukaani:xz", + "org.xerial.snappy:snappy-java", + "org.yaml:snakeyaml", + "pl.edu.icm:JLargeArrays" + ] } diff --git a/iotdb-core/confignode/pom.xml b/iotdb-core/confignode/pom.xml index 14d0d71cd35..5e77b0eaa5f 100644 --- a/iotdb-core/confignode/pom.xml +++ b/iotdb-core/confignode/pom.xml @@ -117,7 +117,7 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>com.timecho.ratis</groupId> + <groupId>org.apache.ratis</groupId> <artifactId>ratis-common</artifactId> </dependency> <dependency> diff --git a/iotdb-core/consensus/pom.xml b/iotdb-core/consensus/pom.xml index 4d3441dfcd5..aaa5294303c 100644 --- a/iotdb-core/consensus/pom.xml +++ b/iotdb-core/consensus/pom.xml @@ -67,31 +67,31 @@ <version>2.0.6-SNAPSHOT</version> </dependency> <dependency> - <groupId>com.timecho.ratis</groupId> + <groupId>org.apache.ratis</groupId> <artifactId>ratis-server</artifactId> </dependency> <dependency> - <groupId>com.timecho.ratis</groupId> + <groupId>org.apache.ratis</groupId> <artifactId>ratis-server-api</artifactId> </dependency> <dependency> - <groupId>com.timecho.ratis</groupId> + <groupId>org.apache.ratis</groupId> <artifactId>ratis-common</artifactId> </dependency> <dependency> - <groupId>com.timecho.ratis</groupId> + <groupId>org.apache.ratis</groupId> <artifactId>ratis-client</artifactId> </dependency> <dependency> - <groupId>com.timecho.ratis</groupId> + <groupId>org.apache.ratis</groupId> <artifactId>ratis-grpc</artifactId> </dependency> <dependency> - <groupId>com.timecho.ratis</groupId> + <groupId>org.apache.ratis</groupId> <artifactId>ratis-proto</artifactId> </dependency> <dependency> - <groupId>com.timecho.ratis</groupId> + <groupId>org.apache.ratis</groupId> <artifactId>ratis-metrics-api</artifactId> </dependency> <dependency> diff --git a/iotdb-core/datanode/pom.xml b/iotdb-core/datanode/pom.xml index 5d5801a2158..e5bbe5c2152 100644 --- a/iotdb-core/datanode/pom.xml +++ b/iotdb-core/datanode/pom.xml @@ -164,7 +164,7 @@ <artifactId>netty-common</artifactId> </dependency> <dependency> - <groupId>com.timecho.ratis</groupId> + <groupId>org.apache.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 cbc07cdf181..f4dee08df37 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>com.timecho.ratis</groupId> + <groupId>org.apache.ratis</groupId> <artifactId>ratis-common</artifactId> </dependency> </dependencies> diff --git a/pom.xml b/pom.xml index 1d117ccab0e..95e340601d4 100644 --- a/pom.xml +++ b/pom.xml @@ -319,37 +319,37 @@ <version>${commons-io.version}</version> </dependency> <dependency> - <groupId>com.timecho.ratis</groupId> + <groupId>org.apache.ratis</groupId> <artifactId>ratis-server</artifactId> <version>${ratis.version}</version> </dependency> <dependency> - <groupId>com.timecho.ratis</groupId> + <groupId>org.apache.ratis</groupId> <artifactId>ratis-server-api</artifactId> <version>${ratis.version}</version> </dependency> <dependency> - <groupId>com.timecho.ratis</groupId> + <groupId>org.apache.ratis</groupId> <artifactId>ratis-common</artifactId> <version>${ratis.version}</version> </dependency> <dependency> - <groupId>com.timecho.ratis</groupId> + <groupId>org.apache.ratis</groupId> <artifactId>ratis-client</artifactId> <version>${ratis.version}</version> </dependency> <dependency> - <groupId>com.timecho.ratis</groupId> + <groupId>org.apache.ratis</groupId> <artifactId>ratis-grpc</artifactId> <version>${ratis.version}</version> </dependency> <dependency> - <groupId>com.timecho.ratis</groupId> + <groupId>org.apache.ratis</groupId> <artifactId>ratis-proto</artifactId> <version>${ratis.version}</version> </dependency> <dependency> - <groupId>com.timecho.ratis</groupId> + <groupId>org.apache.ratis</groupId> <artifactId>ratis-metrics-api</artifactId> <version>${ratis.version}</version> </dependency>
