Fix conflict

apache · Aug 2, 2024 · 2c9ff64 · 2c9ff64
1 parent f0ecdfe
commit 2c9ff64
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/extension/persistence/eclipselink/build.gradle b/extension/persistence/eclipselink/build.gradle
@@ -20,6 +20,7 @@ dependencies {
     implementation(libs.eclipselink)
     implementation(platform(libs.dropwizard.bom))
     implementation("io.dropwizard:dropwizard-jackson")
+    implementation(libs.h2) // Different dependencies will be needed for different backend databases
 
     testImplementation(libs.h2)
     testImplementation(testFixtures(project(":polaris-core")))

diff --git a/polaris-service/build.gradle b/polaris-service/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     implementation(project(":polaris-core"))
     implementation(project(":polaris-eclipselink"))
 
-    implementation(platform("org.apache.iceberg:iceberg-bom:${icebergVersion}"))
+    implementation(platform(libs.iceberg.bom))
     implementation("org.apache.iceberg:iceberg-api")
     implementation("org.apache.iceberg:iceberg-core")
     implementation("org.apache.iceberg:iceberg-aws")