This is an automated email from the ASF dual-hosted git repository.
amoghj 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 a642a9350e Build: Clean up Jackson dependency usages (#10448)
a642a9350e is described below
commit a642a9350e06dc244ec167372985564372896850
Author: Eduard Tudenhoefner <[email protected]>
AuthorDate: Wed Jun 5 17:22:22 2024 +0200
Build: Clean up Jackson dependency usages (#10448)
---
build.gradle | 18 +++++++++---------
gradle/libs.versions.toml | 5 +++--
kafka-connect/build.gradle | 4 ++--
mr/build.gradle | 2 +-
4 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/build.gradle b/build.gradle
index 2b95fe2917..314393dfd9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -352,8 +352,8 @@ project(':iceberg-core') {
implementation libs.aircompressor
implementation libs.httpcomponents.httpclient5
implementation platform(libs.jackson.bom)
- implementation "com.fasterxml.jackson.core:jackson-core"
- implementation "com.fasterxml.jackson.core:jackson-databind"
+ implementation libs.jackson.core
+ implementation libs.jackson.databind
implementation libs.caffeine
implementation libs.roaringbitmap
compileOnly(libs.hadoop2.client) {
@@ -469,8 +469,8 @@ project(':iceberg-aws') {
compileOnly libs.immutables.value
implementation libs.caffeine
implementation platform(libs.jackson.bom)
- implementation "com.fasterxml.jackson.core:jackson-databind"
- implementation "com.fasterxml.jackson.core:jackson-core"
+ implementation libs.jackson.core
+ implementation libs.jackson.databind
compileOnly(platform(libs.awssdk.bom))
compileOnly(libs.awssdk.s3accessgrants)
@@ -582,7 +582,7 @@ project(':iceberg-delta-lake') {
implementation project(':iceberg-core')
implementation project(':iceberg-parquet')
implementation platform(libs.jackson.bom)
- implementation "com.fasterxml.jackson.core:jackson-databind"
+ implementation libs.jackson.databind
annotationProcessor libs.immutables.value
compileOnly libs.immutables.value
@@ -912,8 +912,8 @@ project(':iceberg-nessie') {
exclude group: 'com.fasterxml.jackson'
}
implementation platform(libs.jackson.bom)
- implementation "com.fasterxml.jackson.core:jackson-databind"
- implementation "com.fasterxml.jackson.core:jackson-core"
+ implementation libs.jackson.core
+ implementation libs.jackson.databind
compileOnly libs.hadoop2.common
// Only there to prevent "warning: unknown enum constant
SchemaType.OBJECT" compile messages
@@ -964,8 +964,8 @@ project(':iceberg-snowflake') {
implementation project(':iceberg-common')
implementation project(path: ':iceberg-bundled-guava', configuration:
'shadow')
implementation platform(libs.jackson.bom)
- implementation "com.fasterxml.jackson.core:jackson-databind"
- implementation "com.fasterxml.jackson.core:jackson-core"
+ implementation libs.jackson.core
+ implementation libs.jackson.databind
runtimeOnly libs.snowflake.jdbc
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2784a1b613..1ad8ee6914 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -142,8 +142,9 @@ hive3-service = { module = "org.apache.hive:hive-service",
version.ref = "hive3"
httpcomponents-httpclient5 = { module =
"org.apache.httpcomponents.client5:httpclient5", version.ref =
"httpcomponents-httpclient5" }
immutables-value = { module = "org.immutables:value", version.ref =
"immutables-value" }
jackson-bom = { module = "com.fasterxml.jackson:jackson-bom", version.ref =
"jackson-bom" }
-jackson-core = { module = "com.fasterxml.jackson:jackson-core", version.ref =
"jackson-bom" }
-jackson-databind = { module = "com.fasterxml.jackson:jackson-databind",
version.ref = "jackson-bom" }
+jackson-core = { module = "com.fasterxml.jackson.core:jackson-core",
version.ref = "jackson-bom" }
+jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind",
version.ref = "jackson-bom" }
+jackson-annotations = { module =
"com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson-bom" }
jackson211-bom = { module = "com.fasterxml.jackson:jackson-bom", version.ref =
"jackson211" }
jackson212-bom = { module = "com.fasterxml.jackson:jackson-bom", version.ref =
"jackson212" }
jackson213-bom = { module = "com.fasterxml.jackson:jackson-bom", version.ref =
"jackson213" }
diff --git a/kafka-connect/build.gradle b/kafka-connect/build.gradle
index 08f044c233..1fdd6bc6ea 100644
--- a/kafka-connect/build.gradle
+++ b/kafka-connect/build.gradle
@@ -40,8 +40,8 @@ project(":iceberg-kafka-connect:iceberg-kafka-connect") {
implementation project(':iceberg-data')
implementation
project(':iceberg-kafka-connect:iceberg-kafka-connect-events')
implementation platform(libs.jackson.bom)
- implementation "com.fasterxml.jackson.core:jackson-core"
- implementation "com.fasterxml.jackson.core:jackson-databind"
+ implementation libs.jackson.core
+ implementation libs.jackson.databind
implementation libs.avro.avro
compileOnly libs.kafka.clients
diff --git a/mr/build.gradle b/mr/build.gradle
index d2bf9290d8..bf8f9ee943 100644
--- a/mr/build.gradle
+++ b/mr/build.gradle
@@ -69,7 +69,7 @@ project(':iceberg-mr') {
testImplementation libs.calcite.core
testImplementation libs.kryo.shaded
testImplementation platform(libs.jackson.bom)
- testImplementation "com.fasterxml.jackson.core:jackson-annotations"
+ testImplementation libs.jackson.annotations
testImplementation(libs.hive2.service) {
exclude group: 'org.apache.hive', module: 'hive-exec'
}
