This is an automated email from the ASF dual-hosted git repository.
ajantha pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris-tools.git
The following commit(s) were added to refs/heads/main by this push:
new 72ddb51 Cleanup Iceberg dependencies (#38)
72ddb51 is described below
commit 72ddb51a0d860937ce8cdfc1f9c8d3ea3e337f49
Author: Ajantha Bhat <[email protected]>
AuthorDate: Tue Nov 4 11:45:47 2025 +0530
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.
---
iceberg-catalog-migrator/api-test/build.gradle.kts | 11 ++++++++++-
iceberg-catalog-migrator/api/build.gradle.kts | 12 ++++++++++--
iceberg-catalog-migrator/cli/build.gradle.kts | 11 ++++++++++-
iceberg-catalog-migrator/gradle/libs.versions.toml | 3 +--
4 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/iceberg-catalog-migrator/api-test/build.gradle.kts
b/iceberg-catalog-migrator/api-test/build.gradle.kts
index d969bbc..102900d 100644
--- a/iceberg-catalog-migrator/api-test/build.gradle.kts
+++ b/iceberg-catalog-migrator/api-test/build.gradle.kts
@@ -33,7 +33,16 @@ dependencies {
exclude("com.google.code.gson", "gson")
exclude("commons-beanutils")
}
- implementation(libs.iceberg.spark.runtime)
+ implementation(platform(libs.iceberg.bom))
+ implementation("org.apache.iceberg:iceberg-api")
+ implementation("org.apache.iceberg:iceberg-core")
+ implementation("org.apache.iceberg:iceberg-common")
+ implementation("org.apache.iceberg:iceberg-aws")
+ implementation("org.apache.iceberg:iceberg-azure")
+ implementation("org.apache.iceberg:iceberg-gcp")
+ implementation("org.apache.iceberg:iceberg-hive-metastore")
+ implementation("org.apache.iceberg:iceberg-nessie")
+ implementation("org.apache.iceberg:iceberg-dell")
implementation(platform(libs.junit.bom))
implementation("org.junit.jupiter:junit-jupiter-api")
implementation("org.apache.iceberg:iceberg-hive-metastore:${libs.versions.iceberg.get()}:tests")
diff --git a/iceberg-catalog-migrator/api/build.gradle.kts
b/iceberg-catalog-migrator/api/build.gradle.kts
index e8d1957..f2ebdd3 100644
--- a/iceberg-catalog-migrator/api/build.gradle.kts
+++ b/iceberg-catalog-migrator/api/build.gradle.kts
@@ -28,8 +28,16 @@ plugins {
dependencies {
implementation(libs.guava)
implementation(libs.slf4j)
- implementation(libs.iceberg.spark.runtime)
- implementation(libs.iceberg.dell)
+ implementation(platform(libs.iceberg.bom))
+ implementation("org.apache.iceberg:iceberg-api")
+ implementation("org.apache.iceberg:iceberg-core")
+ implementation("org.apache.iceberg:iceberg-common")
+ implementation("org.apache.iceberg:iceberg-aws")
+ implementation("org.apache.iceberg:iceberg-azure")
+ implementation("org.apache.iceberg:iceberg-gcp")
+ implementation("org.apache.iceberg:iceberg-hive-metastore")
+ implementation("org.apache.iceberg:iceberg-nessie")
+ implementation("org.apache.iceberg:iceberg-dell")
implementation(libs.hadoop.common) {
exclude("org.apache.avro", "avro")
exclude("org.slf4j", "slf4j-log4j12")
diff --git a/iceberg-catalog-migrator/cli/build.gradle.kts
b/iceberg-catalog-migrator/cli/build.gradle.kts
index 08fae96..36e6d11 100644
--- a/iceberg-catalog-migrator/cli/build.gradle.kts
+++ b/iceberg-catalog-migrator/cli/build.gradle.kts
@@ -37,7 +37,16 @@ dependencies {
implementation(libs.slf4j)
runtimeOnly(libs.logback.classic)
implementation(libs.picocli)
- implementation(libs.iceberg.spark.runtime)
+ implementation(platform(libs.iceberg.bom))
+ implementation("org.apache.iceberg:iceberg-api")
+ implementation("org.apache.iceberg:iceberg-core")
+ implementation("org.apache.iceberg:iceberg-common")
+ implementation("org.apache.iceberg:iceberg-aws")
+ implementation("org.apache.iceberg:iceberg-azure")
+ implementation("org.apache.iceberg:iceberg-gcp")
+ implementation("org.apache.iceberg:iceberg-hive-metastore")
+ implementation("org.apache.iceberg:iceberg-nessie")
+ implementation("org.apache.iceberg:iceberg-dell")
implementation(libs.hadoop.aws) { exclude("com.amazonaws",
"aws-java-sdk-bundle") }
// AWS dependencies based on
https://iceberg.apache.org/docs/latest/aws/#enabling-aws-integration
runtimeOnly(libs.aws.sdk.apache.client)
diff --git a/iceberg-catalog-migrator/gradle/libs.versions.toml
b/iceberg-catalog-migrator/gradle/libs.versions.toml
index d34fac1..98b2b1f 100644
--- a/iceberg-catalog-migrator/gradle/libs.versions.toml
+++ b/iceberg-catalog-migrator/gradle/libs.versions.toml
@@ -62,8 +62,7 @@ google-java-format = { module =
"com.google.googlejavaformat:google-java-format"
guava = { module = "com.google.guava:guava", version.ref = "guava" }
hadoop-aws = { module = "org.apache.hadoop:hadoop-aws", version.ref = "hadoop"
}
hadoop-common = { module = "org.apache.hadoop:hadoop-common", version.ref =
"hadoop" }
-iceberg-dell = { module = "org.apache.iceberg:iceberg-dell", version.ref =
"iceberg" }
-iceberg-spark-runtime = { module =
"org.apache.iceberg:iceberg-spark-runtime-3.5_2.12", version.ref = "iceberg" }
+iceberg-bom = { module = "org.apache.iceberg:iceberg-bom", version.ref =
"iceberg" }
immutables-builder = { module = "org.immutables:builder", version.ref =
"immutables" }
immutables-value-annotations = { module = "org.immutables:value-annotations",
version.ref = "immutables" }
immutables-value-processor = { module = "org.immutables:value-processor",
version.ref = "immutables" }
