This is an automated email from the ASF dual-hosted git repository.
chengpan pushed a commit to branch branch-0.5
in repository https://gitbox.apache.org/repos/asf/celeborn.git
The following commit(s) were added to refs/heads/branch-0.5 by this push:
new 8a0d63ee8 [CELEBORN-1505] Algin the celeborn server jackson dependency
versions
8a0d63ee8 is described below
commit 8a0d63ee8c7859bd7e00dd82c6b39f5174c3170d
Author: Wang, Fei <[email protected]>
AuthorDate: Mon Jul 15 11:00:23 2024 +0800
[CELEBORN-1505] Algin the celeborn server jackson dependency versions
Now there are three different jackson versions in the server dependency
list.
It is better to align them.
To align the dependency versions and reduce the conflicts in the future.
No.
Pass the GA.
Closes #2620 from turboFei/align_jackson.
Authored-by: Wang, Fei <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
(cherry picked from commit 0b8c9fdd4cd98c0326992c44c42e6a37a7061d74)
Signed-off-by: Cheng Pan <[email protected]>
---
dev/deps/dependencies-server | 10 +++++-----
pom.xml | 10 ++++++++++
project/CelebornBuild.scala | 5 +++++
service/pom.xml | 15 +++++++++++++++
4 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/dev/deps/dependencies-server b/dev/deps/dependencies-server
index d3f491677..9e8795b2d 100644
--- a/dev/deps/dependencies-server
+++ b/dev/deps/dependencies-server
@@ -35,11 +35,11 @@ hk2-utils/2.6.1//hk2-utils-2.6.1.jar
jackson-annotations/2.15.3//jackson-annotations-2.15.3.jar
jackson-core/2.15.3//jackson-core-2.15.3.jar
jackson-databind/2.15.3//jackson-databind-2.15.3.jar
-jackson-dataformat-yaml/2.13.2//jackson-dataformat-yaml-2.13.2.jar
-jackson-datatype-jsr310/2.13.2//jackson-datatype-jsr310-2.13.2.jar
-jackson-jaxrs-base/2.13.2//jackson-jaxrs-base-2.13.2.jar
-jackson-jaxrs-json-provider/2.13.2//jackson-jaxrs-json-provider-2.13.2.jar
-jackson-module-jaxb-annotations/2.14.1//jackson-module-jaxb-annotations-2.14.1.jar
+jackson-dataformat-yaml/2.15.3//jackson-dataformat-yaml-2.15.3.jar
+jackson-datatype-jsr310/2.15.3//jackson-datatype-jsr310-2.15.3.jar
+jackson-jaxrs-base/2.15.3//jackson-jaxrs-base-2.15.3.jar
+jackson-jaxrs-json-provider/2.15.3//jackson-jaxrs-json-provider-2.15.3.jar
+jackson-module-jaxb-annotations/2.15.3//jackson-module-jaxb-annotations-2.15.3.jar
jackson-module-scala_2.12/2.15.3//jackson-module-scala_2.12-2.15.3.jar
jakarta.annotation-api/1.3.5//jakarta.annotation-api-1.3.5.jar
jakarta.inject/2.6.1//jakarta.inject-2.6.1.jar
diff --git a/pom.xml b/pom.xml
index 876741f9d..1413b33a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -636,6 +636,16 @@
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jsr310</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
diff --git a/project/CelebornBuild.scala b/project/CelebornBuild.scala
index 2f46580fe..d0c5de1be 100644
--- a/project/CelebornBuild.scala
+++ b/project/CelebornBuild.scala
@@ -139,6 +139,11 @@ object Dependencies {
val jacksonCore = "com.fasterxml.jackson.core" % "jackson-core" %
jacksonVersion
val jacksonAnnotations = "com.fasterxml.jackson.core" %
"jackson-annotations" % jacksonVersion
val jacksonModule = "com.fasterxml.jackson.module" %% "jackson-module-scala"
% jacksonVersion
+ val jacksonDataTypeJsr310 = "com.fasterxml.jackson.datatype" %
"jackson-datatype-jsr310" % jacksonVersion
+ val jacksonDataFormatYam = "com.fasterxml.jackson.dataformat" %
"jackson-dataformat-yaml" % jacksonVersion
+ val jacksonJaxrsBase = "com.fasterxml.jackson.jaxrs" % "jackson-jaxrs-base"
% jacksonVersion
+ val jacksonJaxrsJsonProvider = "com.fasterxml.jackson.jaxrs" %
"jackson-jaxrs-json-provider" % jacksonVersion
+ val jacksonModuleJaxbAnnotations = "com.fasterxml.jackson.module" %
"jackson-module-jaxb-annotations" % jacksonVersion
val scalaReflect = "org.scala-lang" % "scala-reflect" % projectScalaVersion
val slf4jApi = "org.slf4j" % "slf4j-api" % slf4jVersion
val slf4jJulToSlf4j = "org.slf4j" % "jul-to-slf4j" % slf4jVersion
diff --git a/service/pom.xml b/service/pom.xml
index 8cc0721a5..ca2aacf52 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -56,6 +56,21 @@
<artifactId>jetty-proxy</artifactId>
<version>${jetty.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-base</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
