From 0b8c9fdd4cd98c0326992c44c42e6a37a7061d74 Mon Sep 17 00:00:00 2001
From: "Wang, Fei" <fwang12@ebay.com>
Date: Mon, 15 Jul 2024 11:00:23 +0800
Subject: [PATCH] [CELEBORN-1505] Algin the celeborn server jackson dependency
 versions

### What changes were proposed in this pull request?

Now there are three different jackson versions in the server dependency list.

It is better to align them.

### Why are the changes needed?
To align the dependency versions and reduce the conflicts in the future.

### Does this PR introduce _any_ user-facing change?

No.

### How was this patch tested?
Pass the GA.

Closes #2620 from turboFei/align_jackson.

Authored-by: Wang, Fei <fwang12@ebay.com>
Signed-off-by: Cheng Pan <chengpan@apache.org>
---
 dev/deps/dependencies-server   | 10 +++++-----
 openapi/openapi-client/pom.xml |  5 -----
 pom.xml                        | 10 ++++++++++
 project/CelebornBuild.scala    |  4 ++++
 service/pom.xml                | 15 +++++++++++++++
 5 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/dev/deps/dependencies-server b/dev/deps/dependencies-server
index 2cdab3abf..4e305005e 100644
--- a/dev/deps/dependencies-server
+++ b/dev/deps/dependencies-server
@@ -36,11 +36,11 @@ jackson-annotations/2.15.3//jackson-annotations-2.15.3.jar
 jackson-core/2.15.3//jackson-core-2.15.3.jar
 jackson-databind-nullable/0.2.6//jackson-databind-nullable-0.2.6.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/openapi/openapi-client/pom.xml b/openapi/openapi-client/pom.xml
index ffe09c774..2636f2bf3 100644
--- a/openapi/openapi-client/pom.xml
+++ b/openapi/openapi-client/pom.xml
@@ -36,11 +36,6 @@
         <artifactId>jersey-client</artifactId>
         <version>${jersey.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.datatype</groupId>
-        <artifactId>jackson-datatype-jsr310</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/pom.xml b/pom.xml
index eae2f1dbc..1f7ad3615 100644
--- a/pom.xml
+++ b/pom.xml
@@ -668,6 +668,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 c73651b59..18845089f 100644
--- a/project/CelebornBuild.scala
+++ b/project/CelebornBuild.scala
@@ -144,6 +144,10 @@ object Dependencies {
   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 16b4fac4e..3d7a7e3ef 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>