From 4a56371f044e4cb1d9363685c33fbb32372fb929 Mon Sep 17 00:00:00 2001 From: Yong Zheng Date: Wed, 31 Jul 2024 20:14:27 -0500 Subject: [PATCH 1/3] Enable eclipselink for metastore --- build.gradle | 4 ++++ extension/persistence/eclipselink/build.gradle | 3 ++- polaris-server.yml | 2 ++ polaris-service/build.gradle | 3 ++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 68d9d97ceb..bd61bffd36 100644 --- a/build.gradle +++ b/build.gradle @@ -71,6 +71,10 @@ subprojects { apply plugin: "java-library" } + project(":polaris-eclipselink") { + apply plugin: "java-library" + } + dependencies { implementation(platform("com.fasterxml.jackson:jackson-bom:${jacksonVersion}")) implementation("com.fasterxml.jackson.core:jackson-annotations") diff --git a/extension/persistence/eclipselink/build.gradle b/extension/persistence/eclipselink/build.gradle index f872994358..1c3f51a629 100644 --- a/extension/persistence/eclipselink/build.gradle +++ b/extension/persistence/eclipselink/build.gradle @@ -19,7 +19,8 @@ dependencies { implementation(project(":polaris-service")) implementation("org.eclipse.persistence:eclipselink:4.0.3") implementation("io.dropwizard:dropwizard-jackson:${dropwizardVersion}") - + implementation("com.h2database:h2:2.2.224") // Different dependencies will be needed for different backend database + testImplementation("com.h2database:h2:2.2.224") testImplementation(testFixtures(project(":polaris-core"))) } diff --git a/polaris-server.yml b/polaris-server.yml index 886221937e..cdfeb7027b 100644 --- a/polaris-server.yml +++ b/polaris-server.yml @@ -89,6 +89,8 @@ defaultRealms: metaStoreManager: type: in-memory + # type: eclipse-link # uncomment to use eclipse-link as metastore + # persistence-unit: polaris-dev # TODO - avoid duplicating token broker config oauth2: diff --git a/polaris-service/build.gradle b/polaris-service/build.gradle index fb99ef01ef..e3a3a23c60 100644 --- a/polaris-service/build.gradle +++ b/polaris-service/build.gradle @@ -21,7 +21,8 @@ plugins { dependencies { implementation(project(":polaris-core")) - + runtimeOnly(project(":polaris-eclipselink")) + implementation(platform("org.apache.iceberg:iceberg-bom:${icebergVersion}")) implementation("org.apache.iceberg:iceberg-api") implementation("org.apache.iceberg:iceberg-core") From 61308e42a0f019b4fa3476fc33b3d3b98dc4d2ea Mon Sep 17 00:00:00 2001 From: Yong Zheng Date: Wed, 31 Jul 2024 20:55:41 -0500 Subject: [PATCH 2/3] Update dependencies between polaris-service and eclipselink --- extension/persistence/eclipselink/build.gradle | 2 +- polaris-service/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extension/persistence/eclipselink/build.gradle b/extension/persistence/eclipselink/build.gradle index 1c3f51a629..44f07ae0ec 100644 --- a/extension/persistence/eclipselink/build.gradle +++ b/extension/persistence/eclipselink/build.gradle @@ -16,7 +16,7 @@ dependencies { implementation(project(":polaris-core")) - implementation(project(":polaris-service")) + runtimeOnly(project(":polaris-service")) implementation("org.eclipse.persistence:eclipselink:4.0.3") implementation("io.dropwizard:dropwizard-jackson:${dropwizardVersion}") implementation("com.h2database:h2:2.2.224") // Different dependencies will be needed for different backend database diff --git a/polaris-service/build.gradle b/polaris-service/build.gradle index e3a3a23c60..4857f3c46e 100644 --- a/polaris-service/build.gradle +++ b/polaris-service/build.gradle @@ -21,7 +21,7 @@ plugins { dependencies { implementation(project(":polaris-core")) - runtimeOnly(project(":polaris-eclipselink")) + implementation(project(":polaris-eclipselink")) implementation(platform("org.apache.iceberg:iceberg-bom:${icebergVersion}")) implementation("org.apache.iceberg:iceberg-api") From 2c9ff64907daedc5321d442a50b1d738f314a190 Mon Sep 17 00:00:00 2001 From: Yong Zheng Date: Fri, 2 Aug 2024 14:08:01 -0500 Subject: [PATCH 3/3] Fix conflict --- extension/persistence/eclipselink/build.gradle | 1 + polaris-service/build.gradle | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/extension/persistence/eclipselink/build.gradle b/extension/persistence/eclipselink/build.gradle index 842facc38a..91fb0c9c73 100644 --- 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 index 092bfb729f..37106acd8f 100644 --- 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")