Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,8 @@ lazy val spark = (project in file("spark"))
sparkMimaSettings,
releaseSettings,
crossSparkSettings(),
// Force Avro 1.12.0 to support Iceberg 1.9.0
dependencyOverrides += "org.apache.avro" % "avro" % "1.12.0",
libraryDependencies ++= Seq(
// Adding test classifier seems to break transitive resolution of the core dependencies
"org.apache.spark" %% "spark-hive" % sparkVersion.value % "provided",
Expand Down Expand Up @@ -862,6 +864,7 @@ lazy val iceberg = (project in file("iceberg"))
commonSettings,
scalaStyleSettings,
releaseSettings,
dependencyOverrides += "org.apache.avro" % "avro" % "1.12.0",
libraryDependencies ++= Seq(
// Fix Iceberg's legacy java.lang.NoClassDefFoundError: scala/jdk/CollectionConverters$ error
// due to legacy scala.
Expand Down Expand Up @@ -922,7 +925,7 @@ lazy val iceberg = (project in file("iceberg"))
)
// scalastyle:on println

val icebergShadedVersion = "1.8.0"
val icebergShadedVersion = "1.9.0"
lazy val icebergShaded = (project in file("icebergShaded"))
.dependsOn(spark % "provided")
.disablePlugins(JavaFormatterPlugin, ScalafmtPlugin)
Expand Down
Loading
Loading