diff --git a/common/pom.xml b/common/pom.xml index 3273303dd15..29baba769bf 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -30,14 +30,6 @@ Celeborn Common - - org.apache.ratis - ratis-common - - - org.apache.ratis - ratis-client - io.dropwizard.metrics metrics-core diff --git a/dev/deps/dependencies-client-flink-1.14 b/dev/deps/dependencies-client-flink-1.14 index f3ce797acf2..0380d321b34 100644 --- a/dev/deps/dependencies-client-flink-1.14 +++ b/dev/deps/dependencies-client-flink-1.14 @@ -73,10 +73,6 @@ netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar paranamer/2.8//paranamer-2.8.jar protobuf-java/3.21.7//protobuf-java-3.21.7.jar -ratis-client/3.0.1//ratis-client-3.0.1.jar -ratis-common/3.0.1//ratis-common-3.0.1.jar -ratis-proto/3.0.1//ratis-proto-3.0.1.jar -ratis-thirdparty-misc/1.0.5//ratis-thirdparty-misc-1.0.5.jar scala-library/2.12.18//scala-library-2.12.18.jar scala-reflect/2.12.18//scala-reflect-2.12.18.jar slf4j-api/1.7.36//slf4j-api-1.7.36.jar diff --git a/dev/deps/dependencies-client-flink-1.15 b/dev/deps/dependencies-client-flink-1.15 index f3ce797acf2..0380d321b34 100644 --- a/dev/deps/dependencies-client-flink-1.15 +++ b/dev/deps/dependencies-client-flink-1.15 @@ -73,10 +73,6 @@ netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar paranamer/2.8//paranamer-2.8.jar protobuf-java/3.21.7//protobuf-java-3.21.7.jar -ratis-client/3.0.1//ratis-client-3.0.1.jar -ratis-common/3.0.1//ratis-common-3.0.1.jar -ratis-proto/3.0.1//ratis-proto-3.0.1.jar -ratis-thirdparty-misc/1.0.5//ratis-thirdparty-misc-1.0.5.jar scala-library/2.12.18//scala-library-2.12.18.jar scala-reflect/2.12.18//scala-reflect-2.12.18.jar slf4j-api/1.7.36//slf4j-api-1.7.36.jar diff --git a/dev/deps/dependencies-client-flink-1.17 b/dev/deps/dependencies-client-flink-1.17 index f3ce797acf2..0380d321b34 100644 --- a/dev/deps/dependencies-client-flink-1.17 +++ b/dev/deps/dependencies-client-flink-1.17 @@ -73,10 +73,6 @@ netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar paranamer/2.8//paranamer-2.8.jar protobuf-java/3.21.7//protobuf-java-3.21.7.jar -ratis-client/3.0.1//ratis-client-3.0.1.jar -ratis-common/3.0.1//ratis-common-3.0.1.jar -ratis-proto/3.0.1//ratis-proto-3.0.1.jar -ratis-thirdparty-misc/1.0.5//ratis-thirdparty-misc-1.0.5.jar scala-library/2.12.18//scala-library-2.12.18.jar scala-reflect/2.12.18//scala-reflect-2.12.18.jar slf4j-api/1.7.36//slf4j-api-1.7.36.jar diff --git a/dev/deps/dependencies-client-flink-1.18 b/dev/deps/dependencies-client-flink-1.18 index f3ce797acf2..0380d321b34 100644 --- a/dev/deps/dependencies-client-flink-1.18 +++ b/dev/deps/dependencies-client-flink-1.18 @@ -73,10 +73,6 @@ netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar paranamer/2.8//paranamer-2.8.jar protobuf-java/3.21.7//protobuf-java-3.21.7.jar -ratis-client/3.0.1//ratis-client-3.0.1.jar -ratis-common/3.0.1//ratis-common-3.0.1.jar -ratis-proto/3.0.1//ratis-proto-3.0.1.jar -ratis-thirdparty-misc/1.0.5//ratis-thirdparty-misc-1.0.5.jar scala-library/2.12.18//scala-library-2.12.18.jar scala-reflect/2.12.18//scala-reflect-2.12.18.jar slf4j-api/1.7.36//slf4j-api-1.7.36.jar diff --git a/dev/deps/dependencies-client-flink-1.19 b/dev/deps/dependencies-client-flink-1.19 index f3ce797acf2..0380d321b34 100644 --- a/dev/deps/dependencies-client-flink-1.19 +++ b/dev/deps/dependencies-client-flink-1.19 @@ -73,10 +73,6 @@ netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar paranamer/2.8//paranamer-2.8.jar protobuf-java/3.21.7//protobuf-java-3.21.7.jar -ratis-client/3.0.1//ratis-client-3.0.1.jar -ratis-common/3.0.1//ratis-common-3.0.1.jar -ratis-proto/3.0.1//ratis-proto-3.0.1.jar -ratis-thirdparty-misc/1.0.5//ratis-thirdparty-misc-1.0.5.jar scala-library/2.12.18//scala-library-2.12.18.jar scala-reflect/2.12.18//scala-reflect-2.12.18.jar slf4j-api/1.7.36//slf4j-api-1.7.36.jar diff --git a/dev/deps/dependencies-client-mr b/dev/deps/dependencies-client-mr index e952be60b22..4a6aa7d7af1 100644 --- a/dev/deps/dependencies-client-mr +++ b/dev/deps/dependencies-client-mr @@ -180,10 +180,6 @@ okhttp/4.9.3//okhttp-4.9.3.jar okio/2.8.0//okio-2.8.0.jar paranamer/2.8//paranamer-2.8.jar protobuf-java/3.21.7//protobuf-java-3.21.7.jar -ratis-client/3.0.1//ratis-client-3.0.1.jar -ratis-common/3.0.1//ratis-common-3.0.1.jar -ratis-proto/3.0.1//ratis-proto-3.0.1.jar -ratis-thirdparty-misc/1.0.5//ratis-thirdparty-misc-1.0.5.jar re2j/1.1//re2j-1.1.jar reload4j/1.2.22//reload4j-1.2.22.jar scala-library/2.12.18//scala-library-2.12.18.jar diff --git a/dev/deps/dependencies-client-spark-2.4 b/dev/deps/dependencies-client-spark-2.4 index dc0d1a71891..bb5e0f9f2e4 100644 --- a/dev/deps/dependencies-client-spark-2.4 +++ b/dev/deps/dependencies-client-spark-2.4 @@ -73,10 +73,6 @@ netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar paranamer/2.8//paranamer-2.8.jar protobuf-java/3.21.7//protobuf-java-3.21.7.jar -ratis-client/3.0.1//ratis-client-3.0.1.jar -ratis-common/3.0.1//ratis-common-3.0.1.jar -ratis-proto/3.0.1//ratis-proto-3.0.1.jar -ratis-thirdparty-misc/1.0.5//ratis-thirdparty-misc-1.0.5.jar scala-library/2.11.12//scala-library-2.11.12.jar scala-reflect/2.11.12//scala-reflect-2.11.12.jar slf4j-api/1.7.36//slf4j-api-1.7.36.jar diff --git a/dev/deps/dependencies-client-spark-3.0 b/dev/deps/dependencies-client-spark-3.0 index ffb7b0599d8..fffc6e4681b 100644 --- a/dev/deps/dependencies-client-spark-3.0 +++ b/dev/deps/dependencies-client-spark-3.0 @@ -73,10 +73,6 @@ netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar paranamer/2.8//paranamer-2.8.jar protobuf-java/3.21.7//protobuf-java-3.21.7.jar -ratis-client/3.0.1//ratis-client-3.0.1.jar -ratis-common/3.0.1//ratis-common-3.0.1.jar -ratis-proto/3.0.1//ratis-proto-3.0.1.jar -ratis-thirdparty-misc/1.0.5//ratis-thirdparty-misc-1.0.5.jar scala-library/2.12.10//scala-library-2.12.10.jar scala-reflect/2.12.10//scala-reflect-2.12.10.jar slf4j-api/1.7.36//slf4j-api-1.7.36.jar diff --git a/dev/deps/dependencies-client-spark-3.1 b/dev/deps/dependencies-client-spark-3.1 index 381b67ff46d..da095542cde 100644 --- a/dev/deps/dependencies-client-spark-3.1 +++ b/dev/deps/dependencies-client-spark-3.1 @@ -73,10 +73,6 @@ netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar paranamer/2.8//paranamer-2.8.jar protobuf-java/3.21.7//protobuf-java-3.21.7.jar -ratis-client/3.0.1//ratis-client-3.0.1.jar -ratis-common/3.0.1//ratis-common-3.0.1.jar -ratis-proto/3.0.1//ratis-proto-3.0.1.jar -ratis-thirdparty-misc/1.0.5//ratis-thirdparty-misc-1.0.5.jar scala-library/2.12.10//scala-library-2.12.10.jar scala-reflect/2.12.10//scala-reflect-2.12.10.jar slf4j-api/1.7.36//slf4j-api-1.7.36.jar diff --git a/dev/deps/dependencies-client-spark-3.2 b/dev/deps/dependencies-client-spark-3.2 index ba87c7a60a8..76f5b0211a2 100644 --- a/dev/deps/dependencies-client-spark-3.2 +++ b/dev/deps/dependencies-client-spark-3.2 @@ -73,10 +73,6 @@ netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar paranamer/2.8//paranamer-2.8.jar protobuf-java/3.21.7//protobuf-java-3.21.7.jar -ratis-client/3.0.1//ratis-client-3.0.1.jar -ratis-common/3.0.1//ratis-common-3.0.1.jar -ratis-proto/3.0.1//ratis-proto-3.0.1.jar -ratis-thirdparty-misc/1.0.5//ratis-thirdparty-misc-1.0.5.jar scala-library/2.12.15//scala-library-2.12.15.jar scala-reflect/2.12.15//scala-reflect-2.12.15.jar slf4j-api/1.7.36//slf4j-api-1.7.36.jar diff --git a/dev/deps/dependencies-client-spark-3.3 b/dev/deps/dependencies-client-spark-3.3 index a5da10cf377..8102a540fd4 100644 --- a/dev/deps/dependencies-client-spark-3.3 +++ b/dev/deps/dependencies-client-spark-3.3 @@ -73,10 +73,6 @@ netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar paranamer/2.8//paranamer-2.8.jar protobuf-java/3.21.7//protobuf-java-3.21.7.jar -ratis-client/3.0.1//ratis-client-3.0.1.jar -ratis-common/3.0.1//ratis-common-3.0.1.jar -ratis-proto/3.0.1//ratis-proto-3.0.1.jar -ratis-thirdparty-misc/1.0.5//ratis-thirdparty-misc-1.0.5.jar scala-library/2.12.15//scala-library-2.12.15.jar scala-reflect/2.12.15//scala-reflect-2.12.15.jar slf4j-api/1.7.36//slf4j-api-1.7.36.jar diff --git a/dev/deps/dependencies-client-spark-3.4 b/dev/deps/dependencies-client-spark-3.4 index 6f00059361d..96996db7743 100644 --- a/dev/deps/dependencies-client-spark-3.4 +++ b/dev/deps/dependencies-client-spark-3.4 @@ -73,10 +73,6 @@ netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar paranamer/2.8//paranamer-2.8.jar protobuf-java/3.21.7//protobuf-java-3.21.7.jar -ratis-client/3.0.1//ratis-client-3.0.1.jar -ratis-common/3.0.1//ratis-common-3.0.1.jar -ratis-proto/3.0.1//ratis-proto-3.0.1.jar -ratis-thirdparty-misc/1.0.5//ratis-thirdparty-misc-1.0.5.jar scala-library/2.12.17//scala-library-2.12.17.jar scala-reflect/2.12.17//scala-reflect-2.12.17.jar slf4j-api/1.7.36//slf4j-api-1.7.36.jar diff --git a/dev/deps/dependencies-client-spark-3.5 b/dev/deps/dependencies-client-spark-3.5 index bce13ca7c84..371e6479aa3 100644 --- a/dev/deps/dependencies-client-spark-3.5 +++ b/dev/deps/dependencies-client-spark-3.5 @@ -73,10 +73,6 @@ netty-transport-udt/4.1.109.Final//netty-transport-udt-4.1.109.Final.jar netty-transport/4.1.109.Final//netty-transport-4.1.109.Final.jar paranamer/2.8//paranamer-2.8.jar protobuf-java/3.21.7//protobuf-java-3.21.7.jar -ratis-client/3.0.1//ratis-client-3.0.1.jar -ratis-common/3.0.1//ratis-common-3.0.1.jar -ratis-proto/3.0.1//ratis-proto-3.0.1.jar -ratis-thirdparty-misc/1.0.5//ratis-thirdparty-misc-1.0.5.jar scala-library/2.12.18//scala-library-2.12.18.jar scala-reflect/2.12.18//scala-reflect-2.12.18.jar slf4j-api/1.7.36//slf4j-api-1.7.36.jar diff --git a/project/CelebornBuild.scala b/project/CelebornBuild.scala index c616237b0e0..0ce59ddf64f 100644 --- a/project/CelebornBuild.scala +++ b/project/CelebornBuild.scala @@ -438,8 +438,6 @@ object CelebornCommon { Dependencies.hadoopClientApi, Dependencies.hadoopClientRuntime, Dependencies.jdkTools, - Dependencies.ratisClient, - Dependencies.ratisCommon, Dependencies.leveldbJniAll, Dependencies.roaringBitmap, Dependencies.scalaReflect, @@ -569,11 +567,6 @@ object CelebornWorker { .dependsOn(CelebornMaster.master % "test->compile") .settings ( commonSettings, - excludeDependencies ++= Seq( - // ratis-common/ratis-client are the transitive dependencies from celeborn-common - ExclusionRule("org.apache.ratis", "ratis-common"), - ExclusionRule("org.apache.ratis", "ratis-client") - ), libraryDependencies ++= Seq( Dependencies.apLoader, Dependencies.guava, diff --git a/worker/pom.xml b/worker/pom.xml index e0be5e90434..31c624e3b8e 100644 --- a/worker/pom.xml +++ b/worker/pom.xml @@ -32,16 +32,6 @@ org.apache.celeborn celeborn-common_${scala.binary.version} ${project.version} - - - org.apache.ratis - ratis-common - - - org.apache.ratis - ratis-client - - org.apache.celeborn