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/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