(iceberg) branch main updated: Build: Align Jackson versions (#9925)

[et...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

etudenhoefner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git


The following commit(s) were added to refs/heads/main by this push:
     new 43c3397528 Build: Align Jackson versions (#9925)
43c3397528 is described below

commit 43c3397528101859250160f123a0749bae79fb4d
Author: Eduard Tudenhoefner <et...@gmail.com>
AuthorDate: Tue Mar 12 17:51:03 2024 +0100

    Build: Align Jackson versions (#9925)
---
 build.gradle              | 3 ++-
 gradle/libs.versions.toml | 4 ----
 hive3/build.gradle        | 2 +-
 mr/build.gradle           | 3 ++-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 64b4299d09..c21813a4d4 100644
--- 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
index 4b0094a8ff..867c87374e 100644
--- 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
index fe0d3a9b45..f8bb50951f 100644
--- 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
index 37e665d6d2..d2bf9290d8 100644
--- 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'
     }