Build: Align Jackson versions (apache#9925)

huaxingao · Mar 12, 2024 · 43c3397 · 43c3397
1 parent 71ff8a4
commit 43c3397
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -440,7 +440,8 @@ project(':iceberg-aliyun') {
       exclude group: 'com.google.code.gson', module: 'gson'
     }
 
-    testImplementation libs.jackson.dataformat.xml
+    testImplementation platform(libs.jackson.bom)
+    testImplementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml"
     testImplementation project(path: ':iceberg-api', configuration: 'testArtifacts')
     testImplementation libs.spring.web
     testImplementation(libs.spring.boot.starter.jetty) {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -49,9 +49,7 @@ httpcomponents-httpclient5 = "5.3.1"
 hive2 = { strictly = "2.3.9"} # see rich version usage explanation above
 hive3 = "3.1.3"
 immutables-value = "2.10.1"
-jackson-annotations = "2.16.0"
 jackson-bom = "2.14.2"
-jackson-dataformat-xml = "2.16.1"
 jackson211 = { strictly = "2.11.4"} # see rich version usage explanation above
 jackson212 = { strictly = "2.12.3"}
 jackson213 = { strictly = "2.13.4"}
@@ -193,8 +191,6 @@ flink118-runtime = { module = "org.apache.flink:flink-runtime", version.ref = "f
 flink118-test-utils = { module = "org.apache.flink:flink-test-utils", version.ref = "flink118" }
 flink118-test-utilsjunit = { module = "org.apache.flink:flink-test-utils-junit", version.ref = "flink118" }
 guava-testlib = { module = "com.google.guava:guava-testlib", version.ref = "guava" }
-jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson-annotations" }
-jackson-dataformat-xml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-xml", version.ref = "jackson-dataformat-xml" }
 jakarta-el-api = { module = "jakarta.el:jakarta.el-api", version.ref = "jakarta-el-api" }
 jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = "jetty" }
 jetty-servlet = { module = "org.eclipse.jetty:jetty-servlet", version.ref = "jetty" }

diff --git a/hive3/build.gradle b/hive3/build.gradle
@@ -94,7 +94,7 @@ project(':iceberg-hive3') {
     testImplementation libs.avro.avro
     testImplementation libs.calcite.core
     testImplementation libs.kryo.shaded
-    testImplementation libs.jackson.annotations
+    testImplementation platform(libs.jackson.bom)
     testImplementation(libs.hive3.service) {
       exclude group: 'org.apache.hive', module: 'hive-exec'
       exclude group: 'org.apache.orc'

diff --git a/mr/build.gradle b/mr/build.gradle
@@ -68,7 +68,8 @@ project(':iceberg-mr') {
     testImplementation libs.avro.avro
     testImplementation libs.calcite.core
     testImplementation libs.kryo.shaded
-    testImplementation libs.jackson.annotations
+    testImplementation platform(libs.jackson.bom)
+    testImplementation "com.fasterxml.jackson.core:jackson-annotations"
     testImplementation(libs.hive2.service) {
       exclude group: 'org.apache.hive', module: 'hive-exec'
     }