Skip to content

Commit 72ddb51

Browse files
authored
Cleanup Iceberg dependencies (#38)
Replace `iceberg.spark.runtime` dependency with the required individual Iceberg dependencies. Initially `iceberg.spark.runtime` was used to speed up the development as no need to go through what dependencies are missing or needed for each catalog clients. Now that we have tests for most of the catalogs, it is easy to catch missing dependencies.
1 parent e227497 commit 72ddb51

File tree

4 files changed

+31
-6
lines changed

4 files changed

+31
-6
lines changed

iceberg-catalog-migrator/api-test/build.gradle.kts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,16 @@ dependencies {
3333
exclude("com.google.code.gson", "gson")
3434
exclude("commons-beanutils")
3535
}
36-
implementation(libs.iceberg.spark.runtime)
36+
implementation(platform(libs.iceberg.bom))
37+
implementation("org.apache.iceberg:iceberg-api")
38+
implementation("org.apache.iceberg:iceberg-core")
39+
implementation("org.apache.iceberg:iceberg-common")
40+
implementation("org.apache.iceberg:iceberg-aws")
41+
implementation("org.apache.iceberg:iceberg-azure")
42+
implementation("org.apache.iceberg:iceberg-gcp")
43+
implementation("org.apache.iceberg:iceberg-hive-metastore")
44+
implementation("org.apache.iceberg:iceberg-nessie")
45+
implementation("org.apache.iceberg:iceberg-dell")
3746
implementation(platform(libs.junit.bom))
3847
implementation("org.junit.jupiter:junit-jupiter-api")
3948
implementation("org.apache.iceberg:iceberg-hive-metastore:${libs.versions.iceberg.get()}:tests")

iceberg-catalog-migrator/api/build.gradle.kts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,16 @@ plugins {
2828
dependencies {
2929
implementation(libs.guava)
3030
implementation(libs.slf4j)
31-
implementation(libs.iceberg.spark.runtime)
32-
implementation(libs.iceberg.dell)
31+
implementation(platform(libs.iceberg.bom))
32+
implementation("org.apache.iceberg:iceberg-api")
33+
implementation("org.apache.iceberg:iceberg-core")
34+
implementation("org.apache.iceberg:iceberg-common")
35+
implementation("org.apache.iceberg:iceberg-aws")
36+
implementation("org.apache.iceberg:iceberg-azure")
37+
implementation("org.apache.iceberg:iceberg-gcp")
38+
implementation("org.apache.iceberg:iceberg-hive-metastore")
39+
implementation("org.apache.iceberg:iceberg-nessie")
40+
implementation("org.apache.iceberg:iceberg-dell")
3341
implementation(libs.hadoop.common) {
3442
exclude("org.apache.avro", "avro")
3543
exclude("org.slf4j", "slf4j-log4j12")

iceberg-catalog-migrator/cli/build.gradle.kts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,16 @@ dependencies {
3737
implementation(libs.slf4j)
3838
runtimeOnly(libs.logback.classic)
3939
implementation(libs.picocli)
40-
implementation(libs.iceberg.spark.runtime)
40+
implementation(platform(libs.iceberg.bom))
41+
implementation("org.apache.iceberg:iceberg-api")
42+
implementation("org.apache.iceberg:iceberg-core")
43+
implementation("org.apache.iceberg:iceberg-common")
44+
implementation("org.apache.iceberg:iceberg-aws")
45+
implementation("org.apache.iceberg:iceberg-azure")
46+
implementation("org.apache.iceberg:iceberg-gcp")
47+
implementation("org.apache.iceberg:iceberg-hive-metastore")
48+
implementation("org.apache.iceberg:iceberg-nessie")
49+
implementation("org.apache.iceberg:iceberg-dell")
4150
implementation(libs.hadoop.aws) { exclude("com.amazonaws", "aws-java-sdk-bundle") }
4251
// AWS dependencies based on https://iceberg.apache.org/docs/latest/aws/#enabling-aws-integration
4352
runtimeOnly(libs.aws.sdk.apache.client)

iceberg-catalog-migrator/gradle/libs.versions.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ google-java-format = { module = "com.google.googlejavaformat:google-java-format"
6262
guava = { module = "com.google.guava:guava", version.ref = "guava" }
6363
hadoop-aws = { module = "org.apache.hadoop:hadoop-aws", version.ref = "hadoop" }
6464
hadoop-common = { module = "org.apache.hadoop:hadoop-common", version.ref = "hadoop" }
65-
iceberg-dell = { module = "org.apache.iceberg:iceberg-dell", version.ref = "iceberg" }
66-
iceberg-spark-runtime = { module = "org.apache.iceberg:iceberg-spark-runtime-3.5_2.12", version.ref = "iceberg" }
65+
iceberg-bom = { module = "org.apache.iceberg:iceberg-bom", version.ref = "iceberg" }
6766
immutables-builder = { module = "org.immutables:builder", version.ref = "immutables" }
6867
immutables-value-annotations = { module = "org.immutables:value-annotations", version.ref = "immutables" }
6968
immutables-value-processor = { module = "org.immutables:value-processor", version.ref = "immutables" }

0 commit comments

Comments
 (0)