This is an automated email from the ASF dual-hosted git repository.
yufei pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris.git
The following commit(s) were added to refs/heads/main by this push:
new ce3efe6d9 Merge JPA module with EclipseLink Module (#1718)
ce3efe6d9 is described below
commit ce3efe6d9e1493131f968b75027d56d29232f6be
Author: Yufei Gu <[email protected]>
AuthorDate: Wed May 28 18:30:22 2025 -0700
Merge JPA module with EclipseLink Module (#1718)
---
README.md | 1 -
bom/build.gradle.kts | 1 -
extension/persistence/eclipselink/build.gradle.kts | 1 -
.../PolarisEclipseLinkMetaStoreSessionImpl.java | 12 ++++----
.../impl/eclipselink/PolarisEclipseLinkStore.java | 12 ++++----
.../impl/eclipselink/PolarisSequenceUtil.java | 2 +-
.../impl/eclipselink}/models/ModelEntity.java | 2 +-
.../eclipselink}/models/ModelEntityActive.java | 2 +-
.../models/ModelEntityChangeTracking.java | 2 +-
.../impl/eclipselink}/models/ModelGrantRecord.java | 2 +-
.../models/ModelPolicyMappingRecord.java | 2 +-
.../eclipselink}/models/ModelPrincipalSecrets.java | 2 +-
.../impl/eclipselink}/models/ModelSequenceId.java | 2 +-
.../src/main/resources/META-INF/persistence.xml | 14 +++++-----
.../PolarisEclipseLinkMetaStoreManagerTest.java | 2 +-
extension/persistence/jpa-model/build.gradle.kts | 32 ----------------------
getting-started/assets/eclipselink/persistence.xml | 16 +++++------
gradle/projects.main.properties | 1 -
helm/polaris/ci/fixtures/persistence.yaml | 14 +++++-----
.../PostgresTestResourceLifecycleManager.java | 14 +++++-----
site/content/in-dev/unreleased/metastores.md | 28 +++++++++----------
21 files changed, 64 insertions(+), 100 deletions(-)
diff --git a/README.md b/README.md
index 58891eb12..452bf77a4 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,6 @@ Apache Polaris is organized into the following modules:
- `polaris-quarkus-server` - The Polaris server runtime
- `polaris-quarkus-admin-tool` - The Polaris admin & maintenance tool
- Persistence modules:
- - `polaris-jpa-model` - The JPA entity definitions
- `polaris-eclipselink` - The Eclipselink implementation of the
MetaStoreManager interface
- `polaris-relational-jdbc` - The JDBC implementation of BasePersistence to
be used via AtomicMetaStoreManager
diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts
index 5b400f515..47f0e8b9e 100644
--- a/bom/build.gradle.kts
+++ b/bom/build.gradle.kts
@@ -43,7 +43,6 @@ dependencies {
api(project(":polaris-eclipselink"))
api(project(":polaris-relational-jdbc"))
- api(project(":polaris-jpa-model"))
api(project(":polaris-quarkus-admin"))
api(project(":polaris-quarkus-common"))
diff --git a/extension/persistence/eclipselink/build.gradle.kts
b/extension/persistence/eclipselink/build.gradle.kts
index e5d4e655d..ae4cf7c6e 100644
--- a/extension/persistence/eclipselink/build.gradle.kts
+++ b/extension/persistence/eclipselink/build.gradle.kts
@@ -30,7 +30,6 @@ plugins {
dependencies {
implementation(project(":polaris-core"))
- implementation(project(":polaris-jpa-model"))
implementation(libs.eclipselink)
diff --git
a/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java
b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java
index 151d1a548..3731b6800 100644
---
a/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java
+++
b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java
@@ -61,12 +61,12 @@ import
org.apache.polaris.core.policy.PolarisPolicyMappingRecord;
import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo;
import org.apache.polaris.core.storage.PolarisStorageIntegration;
import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider;
-import org.apache.polaris.jpa.models.ModelEntity;
-import org.apache.polaris.jpa.models.ModelEntityActive;
-import org.apache.polaris.jpa.models.ModelEntityChangeTracking;
-import org.apache.polaris.jpa.models.ModelGrantRecord;
-import org.apache.polaris.jpa.models.ModelPolicyMappingRecord;
-import org.apache.polaris.jpa.models.ModelPrincipalSecrets;
+import
org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntity;
+import
org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityActive;
+import
org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityChangeTracking;
+import
org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelGrantRecord;
+import
org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPolicyMappingRecord;
+import
org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPrincipalSecrets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkStore.java
b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkStore.java
index 16fb32356..4a889d3c0 100644
---
a/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkStore.java
+++
b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkStore.java
@@ -38,12 +38,12 @@ import
org.apache.polaris.core.entity.PolarisPrincipalSecrets;
import org.apache.polaris.core.persistence.pagination.PageToken;
import org.apache.polaris.core.policy.PolarisPolicyMappingRecord;
import org.apache.polaris.core.policy.PolicyEntity;
-import org.apache.polaris.jpa.models.ModelEntity;
-import org.apache.polaris.jpa.models.ModelEntityActive;
-import org.apache.polaris.jpa.models.ModelEntityChangeTracking;
-import org.apache.polaris.jpa.models.ModelGrantRecord;
-import org.apache.polaris.jpa.models.ModelPolicyMappingRecord;
-import org.apache.polaris.jpa.models.ModelPrincipalSecrets;
+import
org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntity;
+import
org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityActive;
+import
org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityChangeTracking;
+import
org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelGrantRecord;
+import
org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPolicyMappingRecord;
+import
org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPrincipalSecrets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisSequenceUtil.java
b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisSequenceUtil.java
index c61fdbe43..48582dd3c 100644
---
a/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisSequenceUtil.java
+++
b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisSequenceUtil.java
@@ -21,7 +21,7 @@ package
org.apache.polaris.extension.persistence.impl.eclipselink;
import jakarta.persistence.*;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.polaris.jpa.models.ModelSequenceId;
+import
org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelSequenceId;
import org.eclipse.persistence.internal.jpa.EntityManagerImpl;
import org.eclipse.persistence.platform.database.DatabasePlatform;
import org.eclipse.persistence.platform.database.PostgreSQLPlatform;
diff --git
a/extension/persistence/jpa-model/src/main/java/org/apache/polaris/jpa/models/ModelEntity.java
b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelEntity.java
similarity index 99%
rename from
extension/persistence/jpa-model/src/main/java/org/apache/polaris/jpa/models/ModelEntity.java
rename to
extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelEntity.java
index 6e5ef077f..b54eb2103 100644
---
a/extension/persistence/jpa-model/src/main/java/org/apache/polaris/jpa/models/ModelEntity.java
+++
b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelEntity.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.polaris.jpa.models;
+package org.apache.polaris.extension.persistence.impl.eclipselink.models;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
diff --git
a/extension/persistence/jpa-model/src/main/java/org/apache/polaris/jpa/models/ModelEntityActive.java
b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelEntityActive.java
similarity index 98%
rename from
extension/persistence/jpa-model/src/main/java/org/apache/polaris/jpa/models/ModelEntityActive.java
rename to
extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelEntityActive.java
index 56770d1be..8e9bd8c8b 100644
---
a/extension/persistence/jpa-model/src/main/java/org/apache/polaris/jpa/models/ModelEntityActive.java
+++
b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelEntityActive.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.polaris.jpa.models;
+package org.apache.polaris.extension.persistence.impl.eclipselink.models;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
diff --git
a/extension/persistence/jpa-model/src/main/java/org/apache/polaris/jpa/models/ModelEntityChangeTracking.java
b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelEntityChangeTracking.java
similarity index 97%
rename from
extension/persistence/jpa-model/src/main/java/org/apache/polaris/jpa/models/ModelEntityChangeTracking.java
rename to
extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelEntityChangeTracking.java
index 08035a5f8..0eb4e01f9 100644
---
a/extension/persistence/jpa-model/src/main/java/org/apache/polaris/jpa/models/ModelEntityChangeTracking.java
+++
b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelEntityChangeTracking.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.polaris.jpa.models;
+package org.apache.polaris.extension.persistence.impl.eclipselink.models;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
diff --git
a/extension/persistence/jpa-model/src/main/java/org/apache/polaris/jpa/models/ModelGrantRecord.java
b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelGrantRecord.java
similarity index 98%
rename from
extension/persistence/jpa-model/src/main/java/org/apache/polaris/jpa/models/ModelGrantRecord.java
rename to
extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelGrantRecord.java
index 643e8a1ef..262d77942 100644
---
a/extension/persistence/jpa-model/src/main/java/org/apache/polaris/jpa/models/ModelGrantRecord.java
+++
b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelGrantRecord.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.polaris.jpa.models;
+package org.apache.polaris.extension.persistence.impl.eclipselink.models;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
diff --git
a/extension/persistence/jpa-model/src/main/java/org/apache/polaris/jpa/models/ModelPolicyMappingRecord.java
b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelPolicyMappingRecord.java
similarity index 98%
rename from
extension/persistence/jpa-model/src/main/java/org/apache/polaris/jpa/models/ModelPolicyMappingRecord.java
rename to
extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelPolicyMappingRecord.java
index 0a6f587c4..b58199b0e 100644
---
a/extension/persistence/jpa-model/src/main/java/org/apache/polaris/jpa/models/ModelPolicyMappingRecord.java
+++
b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelPolicyMappingRecord.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.polaris.jpa.models;
+package org.apache.polaris.extension.persistence.impl.eclipselink.models;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
diff --git
a/extension/persistence/jpa-model/src/main/java/org/apache/polaris/jpa/models/ModelPrincipalSecrets.java
b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelPrincipalSecrets.java
similarity index 98%
rename from
extension/persistence/jpa-model/src/main/java/org/apache/polaris/jpa/models/ModelPrincipalSecrets.java
rename to
extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelPrincipalSecrets.java
index 19559642f..61e0697b1 100644
---
a/extension/persistence/jpa-model/src/main/java/org/apache/polaris/jpa/models/ModelPrincipalSecrets.java
+++
b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelPrincipalSecrets.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.polaris.jpa.models;
+package org.apache.polaris.extension.persistence.impl.eclipselink.models;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
diff --git
a/extension/persistence/jpa-model/src/main/java/org/apache/polaris/jpa/models/ModelSequenceId.java
b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelSequenceId.java
similarity index 94%
rename from
extension/persistence/jpa-model/src/main/java/org/apache/polaris/jpa/models/ModelSequenceId.java
rename to
extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelSequenceId.java
index 1ceab448f..7a77b4fe2 100644
---
a/extension/persistence/jpa-model/src/main/java/org/apache/polaris/jpa/models/ModelSequenceId.java
+++
b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelSequenceId.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.polaris.jpa.models;
+package org.apache.polaris.extension.persistence.impl.eclipselink.models;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
diff --git
a/extension/persistence/eclipselink/src/main/resources/META-INF/persistence.xml
b/extension/persistence/eclipselink/src/main/resources/META-INF/persistence.xml
index cd8610599..329281463 100644
---
a/extension/persistence/eclipselink/src/main/resources/META-INF/persistence.xml
+++
b/extension/persistence/eclipselink/src/main/resources/META-INF/persistence.xml
@@ -25,13 +25,13 @@
<persistence-unit name="polaris" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <class>org.apache.polaris.jpa.models.ModelEntity</class>
- <class>org.apache.polaris.jpa.models.ModelEntityActive</class>
- <class>org.apache.polaris.jpa.models.ModelEntityChangeTracking</class>
- <class>org.apache.polaris.jpa.models.ModelGrantRecord</class>
- <class>org.apache.polaris.jpa.models.ModelPolicyMappingRecord</class>
- <class>org.apache.polaris.jpa.models.ModelPrincipalSecrets</class>
- <class>org.apache.polaris.jpa.models.ModelSequenceId</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntity</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityActive</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityChangeTracking</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelGrantRecord</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPolicyMappingRecord</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPrincipalSecrets</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelSequenceId</class>
<shared-cache-mode>NONE</shared-cache-mode>
<properties>
<property name="jakarta.persistence.jdbc.url"
diff --git
a/extension/persistence/eclipselink/src/test/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreManagerTest.java
b/extension/persistence/eclipselink/src/test/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreManagerTest.java
index 320094cd5..03fe51e8b 100644
---
a/extension/persistence/eclipselink/src/test/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreManagerTest.java
+++
b/extension/persistence/eclipselink/src/test/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreManagerTest.java
@@ -41,7 +41,7 @@ import org.apache.polaris.core.entity.PolarisPrincipalSecrets;
import org.apache.polaris.core.persistence.BasePolarisMetaStoreManagerTest;
import org.apache.polaris.core.persistence.PolarisTestMetaStoreManager;
import
org.apache.polaris.core.persistence.transactional.TransactionalMetaStoreManagerImpl;
-import org.apache.polaris.jpa.models.ModelPrincipalSecrets;
+import
org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPrincipalSecrets;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git a/extension/persistence/jpa-model/build.gradle.kts
b/extension/persistence/jpa-model/build.gradle.kts
deleted file mode 100644
index ab782fd79..000000000
--- a/extension/persistence/jpa-model/build.gradle.kts
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-plugins {
- id("polaris-server")
- `java-library`
-}
-
-dependencies {
- implementation(project(":polaris-core"))
- implementation(libs.eclipselink)
-
- compileOnly(libs.jakarta.validation.api)
- compileOnly(libs.jakarta.annotation.api)
- compileOnly(libs.jakarta.persistence.api)
-}
diff --git a/getting-started/assets/eclipselink/persistence.xml
b/getting-started/assets/eclipselink/persistence.xml
index 5ffd9d1b3..62ece56d1 100644
--- a/getting-started/assets/eclipselink/persistence.xml
+++ b/getting-started/assets/eclipselink/persistence.xml
@@ -23,14 +23,14 @@
<persistence-unit name="polaris" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <class>org.apache.polaris.jpa.models.ModelEntity</class>
- <class>org.apache.polaris.jpa.models.ModelEntityActive</class>
- <class>org.apache.polaris.jpa.models.ModelEntityChangeTracking</class>
- <class>org.apache.polaris.jpa.models.ModelEntityDropped</class>
- <class>org.apache.polaris.jpa.models.ModelGrantRecord</class>
- <class>org.apache.polaris.jpa.models.ModelPolicyMappingRecord</class>
- <class>org.apache.polaris.jpa.models.ModelPrincipalSecrets</class>
- <class>org.apache.polaris.jpa.models.ModelSequenceId</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntity</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityActive</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityChangeTracking</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityDropped</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelGrantRecord</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPolicyMappingRecord</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPrincipalSecrets</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelSequenceId</class>
<shared-cache-mode>NONE</shared-cache-mode>
<properties>
<property name="jakarta.persistence.jdbc.url"
value="jdbc:postgresql://postgres:5432/{realm}"/>
diff --git a/gradle/projects.main.properties b/gradle/projects.main.properties
index ed46bf280..9b717cd9e 100644
--- a/gradle/projects.main.properties
+++ b/gradle/projects.main.properties
@@ -34,7 +34,6 @@ polaris-quarkus-admin=quarkus/admin
polaris-quarkus-common=quarkus/common
polaris-quarkus-test-commons=quarkus/test-commons
polaris-eclipselink=extension/persistence/eclipselink
-polaris-jpa-model=extension/persistence/jpa-model
polaris-relational-jdbc=extension/persistence/relational-jdbc
polaris-tests=integration-tests
aggregated-license-report=aggregated-license-report
diff --git a/helm/polaris/ci/fixtures/persistence.yaml
b/helm/polaris/ci/fixtures/persistence.yaml
index c5c12a8c0..9b6e6cab9 100644
--- a/helm/polaris/ci/fixtures/persistence.yaml
+++ b/helm/polaris/ci/fixtures/persistence.yaml
@@ -29,13 +29,13 @@ stringData:
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd";>
<persistence-unit name="polaris" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <class>org.apache.polaris.jpa.models.ModelEntity</class>
- <class>org.apache.polaris.jpa.models.ModelEntityActive</class>
- <class>org.apache.polaris.jpa.models.ModelEntityChangeTracking</class>
- <class>org.apache.polaris.jpa.models.ModelEntityDropped</class>
- <class>org.apache.polaris.jpa.models.ModelGrantRecord</class>
- <class>org.apache.polaris.jpa.models.ModelPrincipalSecrets</class>
- <class>org.apache.polaris.jpa.models.ModelSequenceId</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntity</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityActive</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityChangeTracking</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityDropped</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelGrantRecord</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPrincipalSecrets</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelSequenceId</class>
<shared-cache-mode>NONE</shared-cache-mode>
<properties>
<property name="jakarta.persistence.jdbc.url"
diff --git
a/quarkus/admin/src/testFixtures/java/org/apache/polaris/admintool/PostgresTestResourceLifecycleManager.java
b/quarkus/admin/src/testFixtures/java/org/apache/polaris/admintool/PostgresTestResourceLifecycleManager.java
index 75423b5cd..8126c69ac 100644
---
a/quarkus/admin/src/testFixtures/java/org/apache/polaris/admintool/PostgresTestResourceLifecycleManager.java
+++
b/quarkus/admin/src/testFixtures/java/org/apache/polaris/admintool/PostgresTestResourceLifecycleManager.java
@@ -101,13 +101,13 @@ public class PostgresTestResourceLifecycleManager
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd";>
<persistence-unit name="polaris" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <class>org.apache.polaris.jpa.models.ModelEntity</class>
- <class>org.apache.polaris.jpa.models.ModelEntityActive</class>
-
<class>org.apache.polaris.jpa.models.ModelEntityChangeTracking</class>
- <class>org.apache.polaris.jpa.models.ModelEntityDropped</class>
- <class>org.apache.polaris.jpa.models.ModelGrantRecord</class>
-
<class>org.apache.polaris.jpa.models.ModelPrincipalSecrets</class>
- <class>org.apache.polaris.jpa.models.ModelSequenceId</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntity</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityActive</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityChangeTracking</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityDropped</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelGrantRecord</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPrincipalSecrets</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelSequenceId</class>
<shared-cache-mode>NONE</shared-cache-mode>
<properties>
<property name="jakarta.persistence.jdbc.url" value="%s"/>
diff --git a/site/content/in-dev/unreleased/metastores.md
b/site/content/in-dev/unreleased/metastores.md
index 8d7732519..2660584cd 100644
--- a/site/content/in-dev/unreleased/metastores.md
+++ b/site/content/in-dev/unreleased/metastores.md
@@ -88,13 +88,13 @@ your H2 configuration using the persistence unit template
below:
```xml
<persistence-unit name="polaris" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <class>org.apache.polaris.jpa.models.ModelEntity</class>
- <class>org.apache.polaris.jpa.models.ModelEntityActive</class>
- <class>org.apache.polaris.jpa.models.ModelEntityChangeTracking</class>
- <class>org.apache.polaris.jpa.models.ModelEntityDropped</class>
- <class>org.apache.polaris.jpa.models.ModelGrantRecord</class>
- <class>org.apache.polaris.jpa.models.ModelPrincipalSecrets</class>
- <class>org.apache.polaris.jpa.models.ModelSequenceId</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntity</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityActive</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityChangeTracking</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityDropped</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelGrantRecord</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPrincipalSecrets</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelSequenceId</class>
<shared-cache-mode>NONE</shared-cache-mode>
<properties>
<property name="jakarta.persistence.jdbc.url"
@@ -128,13 +128,13 @@ The following shows a sample configuration for
integrating Polaris with Postgres
```xml
<persistence-unit name="polaris" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <class>org.apache.polaris.jpa.models.ModelEntity</class>
- <class>org.apache.polaris.jpa.models.ModelEntityActive</class>
- <class>org.apache.polaris.jpa.models.ModelEntityChangeTracking</class>
- <class>org.apache.polaris.jpa.models.ModelEntityDropped</class>
- <class>org.apache.polaris.jpa.models.ModelGrantRecord</class>
- <class>org.apache.polaris.jpa.models.ModelPrincipalSecrets</class>
- <class>org.apache.polaris.jpa.models.ModelSequenceId</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntity</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityActive</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityChangeTracking</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityDropped</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelGrantRecord</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPrincipalSecrets</class>
+
<class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelSequenceId</class>
<shared-cache-mode>NONE</shared-cache-mode>
<properties>
<property name="jakarta.persistence.jdbc.url"
