Skip to content

Commit d9a5f9f

Browse files
tdasvkorukanti
authored andcommitted
Re-enabled the iceberg module using iceberg-1.3 on spark 3.4
## Description Re-enabled the iceberg module using iceberg-1.3 on spark 3.4 Existing unit tests. ## Does this PR introduce _any_ user-facing changes? No Closes #1820 Signed-off-by: Scott Sandre <[email protected]> GitOrigin-RevId: c48bfb7c3f4bc3d28b99f31d1d3d6d60afd2fbad
1 parent cebedd9 commit d9a5f9f

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

build.sbt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,7 @@ lazy val storageS3DynamoDB = (project in file("storage-s3-dynamodb"))
242242
)
243243
)
244244

245-
// Requires iceberg release on 3.4
246-
/**
247-
lazy val deltaIceberg = (project in file("delta-iceberg"))
245+
lazy val iceberg = (project in file("iceberg"))
248246
.dependsOn(spark % "compile->compile;test->test;provided->provided")
249247
.settings (
250248
name := "delta-iceberg",
@@ -253,15 +251,14 @@ lazy val deltaIceberg = (project in file("delta-iceberg"))
253251
releaseSettings,
254252
libraryDependencies ++= Seq( {
255253
val (expMaj, expMin, _) = getMajorMinorPatch(sparkVersion)
256-
("org.apache.iceberg" % s"iceberg-spark-runtime-$expMaj.$expMin" % "1.1.0" % "provided")
254+
("org.apache.iceberg" % s"iceberg-spark-runtime-$expMaj.$expMin" % "1.3.0" % "provided")
257255
.cross(CrossVersion.binary)
258256
},
259257
// Fix Iceberg's legacy java.lang.NoClassDefFoundError: scala/jdk/CollectionConverters$ error
260258
// due to legacy scala.
261259
"org.scala-lang.modules" %% "scala-collection-compat" % "2.1.1"
262260
)
263261
)
264-
*/
265262

266263
/**
267264
* Get list of python files and return the mapping between source files and target paths
@@ -291,7 +288,7 @@ val createTargetClassesDir = taskKey[Unit]("create target classes dir")
291288

292289
// Don't use these groups for any other projects
293290
lazy val sparkGroup = project
294-
.aggregate(spark, contribs, storage, storageS3DynamoDB)
291+
.aggregate(spark, contribs, storage, storageS3DynamoDB, iceberg)
295292
.settings(
296293
// crossScalaVersions must be set to Nil on the aggregating project
297294
crossScalaVersions := Nil,

0 commit comments

Comments
 (0)