From 5e93a1c7369754f36dc62db164ad36fd30df95c3 Mon Sep 17 00:00:00 2001 From: ajantha-bhat Date: Thu, 18 May 2023 17:28:54 +0530 Subject: [PATCH] Nessie: Bump Nessie version from 0.58.1 to 0.59.0 --- flink/v1.15/build.gradle | 3 +++ flink/v1.16/build.gradle | 3 +++ flink/v1.17/build.gradle | 3 +++ hive-runtime/build.gradle | 3 +++ .../java/org/apache/iceberg/nessie/NessieTableOperations.java | 2 +- spark/v3.1/build.gradle | 3 +++ spark/v3.2/build.gradle | 3 +++ spark/v3.3/build.gradle | 3 +++ spark/v3.4/build.gradle | 3 +++ versions.props | 2 +- 10 files changed, 26 insertions(+), 2 deletions(-) diff --git a/flink/v1.15/build.gradle b/flink/v1.15/build.gradle index c516612c85fa..98826aa44dc6 100644 --- a/flink/v1.15/build.gradle +++ b/flink/v1.15/build.gradle @@ -152,6 +152,9 @@ project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") { } implementation(project(':iceberg-nessie')) { exclude group: 'com.google.code.findbugs', module: 'jsr305' + // Nessie brings Jackson dependencies of version 2.15.0 or later. + // These are multi-release jars and doesn't work with Java-8 shadowJar plugin. + exclude group: 'com.fasterxml.jackson', module: 'jackson-bom' } // for dropwizard histogram metrics implementation diff --git a/flink/v1.16/build.gradle b/flink/v1.16/build.gradle index b560b5dafc03..11a64854ba19 100644 --- a/flink/v1.16/build.gradle +++ b/flink/v1.16/build.gradle @@ -152,6 +152,9 @@ project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") { } implementation(project(':iceberg-nessie')) { exclude group: 'com.google.code.findbugs', module: 'jsr305' + // Nessie brings Jackson dependencies of version 2.15.0 or later. + // These are multi-release jars and doesn't work with Java-8 shadowJar plugin. + exclude group: 'com.fasterxml.jackson', module: 'jackson-bom' } // for dropwizard histogram metrics implementation diff --git a/flink/v1.17/build.gradle b/flink/v1.17/build.gradle index d7cb6ed8ac01..08fb3c4a5f15 100644 --- a/flink/v1.17/build.gradle +++ b/flink/v1.17/build.gradle @@ -152,6 +152,9 @@ project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") { } implementation(project(':iceberg-nessie')) { exclude group: 'com.google.code.findbugs', module: 'jsr305' + // Nessie brings Jackson dependencies of version 2.15.0 or later. + // These are multi-release jars and doesn't work with Java-8 shadowJar plugin. + exclude group: 'com.fasterxml.jackson', module: 'jackson-bom' } // for dropwizard histogram metrics implementation diff --git a/hive-runtime/build.gradle b/hive-runtime/build.gradle index 8d0689a10445..613f2ca8ab66 100644 --- a/hive-runtime/build.gradle +++ b/hive-runtime/build.gradle @@ -43,6 +43,9 @@ project(':iceberg-hive-runtime') { } implementation(project(':iceberg-nessie')) { exclude group: 'com.google.code.findbugs', module: 'jsr305' + // Nessie brings Jackson dependencies of version 2.15.0 or later. + // These are multi-release jars and doesn't work with Java-8 shadowJar plugin. + exclude group: 'com.fasterxml.jackson', module: 'jackson-bom' } implementation project(':iceberg-aws') implementation(project(':iceberg-aliyun')) { diff --git a/nessie/src/main/java/org/apache/iceberg/nessie/NessieTableOperations.java b/nessie/src/main/java/org/apache/iceberg/nessie/NessieTableOperations.java index 6180311a5d3c..c9486e2e27ad 100644 --- a/nessie/src/main/java/org/apache/iceberg/nessie/NessieTableOperations.java +++ b/nessie/src/main/java/org/apache/iceberg/nessie/NessieTableOperations.java @@ -37,13 +37,13 @@ import org.projectnessie.error.NessieConflictException; import org.projectnessie.error.NessieNotFoundException; import org.projectnessie.error.NessieReferenceConflictException; +import org.projectnessie.error.ReferenceConflicts; import org.projectnessie.model.Conflict; import org.projectnessie.model.Conflict.ConflictType; import org.projectnessie.model.Content; import org.projectnessie.model.ContentKey; import org.projectnessie.model.IcebergTable; import org.projectnessie.model.Reference; -import org.projectnessie.model.ReferenceConflicts; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spark/v3.1/build.gradle b/spark/v3.1/build.gradle index bfb73ab9f230..e2e3d425911f 100644 --- a/spark/v3.1/build.gradle +++ b/spark/v3.1/build.gradle @@ -212,6 +212,9 @@ project(':iceberg-spark:iceberg-spark-runtime-3.1_2.12') { implementation project(':iceberg-hive-metastore') implementation(project(':iceberg-nessie')) { exclude group: 'com.google.code.findbugs', module: 'jsr305' + // Nessie brings Jackson dependencies of version 2.15.0 or later. + // These are multi-release jars and doesn't work with Java-8 shadowJar plugin. + exclude group: 'com.fasterxml.jackson', module: 'jackson-bom' } implementation (project(':iceberg-snowflake')) { exclude group: 'net.snowflake' , module: 'snowflake-jdbc' diff --git a/spark/v3.2/build.gradle b/spark/v3.2/build.gradle index 2b57f49075c0..c614cfb2eee7 100644 --- a/spark/v3.2/build.gradle +++ b/spark/v3.2/build.gradle @@ -216,6 +216,9 @@ project(":iceberg-spark:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersio implementation project(':iceberg-hive-metastore') implementation(project(':iceberg-nessie')) { exclude group: 'com.google.code.findbugs', module: 'jsr305' + // Nessie brings Jackson dependencies of version 2.15.0 or later. + // These are multi-release jars and doesn't work with Java-8 shadowJar plugin. + exclude group: 'com.fasterxml.jackson', module: 'jackson-bom' } implementation (project(':iceberg-snowflake')) { exclude group: 'net.snowflake' , module: 'snowflake-jdbc' diff --git a/spark/v3.3/build.gradle b/spark/v3.3/build.gradle index 875a7fe2ca51..a23762a36749 100644 --- a/spark/v3.3/build.gradle +++ b/spark/v3.3/build.gradle @@ -219,6 +219,9 @@ project(":iceberg-spark:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersio implementation project(':iceberg-hive-metastore') implementation(project(':iceberg-nessie')) { exclude group: 'com.google.code.findbugs', module: 'jsr305' + // Nessie brings Jackson dependencies of version 2.15.0 or later. + // These are multi-release jars and doesn't work with Java-8 shadowJar plugin. + exclude group: 'com.fasterxml.jackson', module: 'jackson-bom' } implementation (project(':iceberg-snowflake')) { exclude group: 'net.snowflake' , module: 'snowflake-jdbc' diff --git a/spark/v3.4/build.gradle b/spark/v3.4/build.gradle index a6514a9dffea..1f3739058c95 100644 --- a/spark/v3.4/build.gradle +++ b/spark/v3.4/build.gradle @@ -221,6 +221,9 @@ project(":iceberg-spark:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersio implementation project(':iceberg-hive-metastore') implementation(project(':iceberg-nessie')) { exclude group: 'com.google.code.findbugs', module: 'jsr305' + // Nessie brings Jackson dependencies of version 2.15.0 or later. + // These are multi-release jars and doesn't work with Java-8 shadowJar plugin. + exclude group: 'com.fasterxml.jackson', module: 'jackson-bom' } implementation (project(':iceberg-snowflake')) { exclude group: 'net.snowflake' , module: 'snowflake-jdbc' diff --git a/versions.props b/versions.props index c9028be3cfcf..42ab05084017 100644 --- a/versions.props +++ b/versions.props @@ -22,7 +22,7 @@ javax.xml.bind:jaxb-api = 2.3.1 javax.activation:activation = 1.1.1 org.glassfish.jaxb:jaxb-runtime = 2.3.3 software.amazon.awssdk:* = 2.20.18 -org.projectnessie.nessie:* = 0.58.1 +org.projectnessie.nessie:* = 0.59.0 com.google.cloud:libraries-bom = 24.1.0 org.scala-lang.modules:scala-collection-compat_2.12 = 2.6.0 org.scala-lang.modules:scala-collection-compat_2.13 = 2.6.0