From 692782958b0ee4cc3f5b717efd454dfb8b09afab Mon Sep 17 00:00:00 2001
From: Nick Cross <ncross@redhat.com>
Date: Thu, 23 Oct 2025 11:16:53 +0100
Subject: [PATCH 1/2] Revert "Update to jakarta namespace for jpa module
 (#115)"

This reverts commit 26ea82435f58768bdfa338f34dbbf736949fa05c.
---
 pathdb/jpa/pom.xml                                        | 6 +++---
 .../storage/pathmapped/pathdb/jpa/JPAPathDB.java          | 8 ++++----
 .../pathmapped/pathdb/jpa/model/JpaFileChecksum.java      | 8 ++++----
 .../storage/pathmapped/pathdb/jpa/model/JpaPathKey.java   | 4 ++--
 .../storage/pathmapped/pathdb/jpa/model/JpaPathMap.java   | 8 ++++----
 .../storage/pathmapped/pathdb/jpa/model/JpaReclaim.java   | 8 ++++----
 .../pathmapped/pathdb/jpa/model/JpaReverseKey.java        | 4 ++--
 .../pathmapped/pathdb/jpa/model/JpaReverseMap.java        | 8 ++++----
 pom.xml                                                   | 2 +-
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/pathdb/jpa/pom.xml b/pathdb/jpa/pom.xml
index f664c56..a7b44e3 100644
--- a/pathdb/jpa/pom.xml
+++ b/pathdb/jpa/pom.xml
@@ -29,9 +29,9 @@
     <dependencies>
         <!-- JPA support-->
         <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-            <version>3.1.0</version>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <version>2.2</version>
         </dependency>
 
         <!--Test-->
diff --git a/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/JPAPathDB.java b/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/JPAPathDB.java
index a2b603d..bfe4dbd 100644
--- a/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/JPAPathDB.java
+++ b/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/JPAPathDB.java
@@ -29,10 +29,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.EntityManagerFactory;
-import jakarta.persistence.Persistence;
-import jakarta.persistence.Query;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+import javax.persistence.Query;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
diff --git a/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaFileChecksum.java b/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaFileChecksum.java
index 366f09b..6257828 100644
--- a/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaFileChecksum.java
+++ b/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaFileChecksum.java
@@ -17,10 +17,10 @@
 
 import org.commonjava.storage.pathmapped.model.FileChecksum;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.util.Objects;
 
 @Entity
diff --git a/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaPathKey.java b/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaPathKey.java
index 6f37113..3c1cb19 100644
--- a/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaPathKey.java
+++ b/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaPathKey.java
@@ -15,8 +15,8 @@
  */
 package org.commonjava.storage.pathmapped.pathdb.jpa.model;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Embeddable;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
 import java.io.Serializable;
 import java.util.Objects;
 
diff --git a/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaPathMap.java b/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaPathMap.java
index 54b14e1..6ccc441 100644
--- a/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaPathMap.java
+++ b/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaPathMap.java
@@ -17,10 +17,10 @@
 
 import org.commonjava.storage.pathmapped.model.PathMap;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.EmbeddedId;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.Table;
 import java.util.Date;
 import java.util.Objects;
 
diff --git a/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaReclaim.java b/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaReclaim.java
index 02a459d..90522c7 100644
--- a/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaReclaim.java
+++ b/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaReclaim.java
@@ -17,10 +17,10 @@
 
 import org.commonjava.storage.pathmapped.model.Reclaim;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.util.Date;
 import java.util.Objects;
 
diff --git a/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaReverseKey.java b/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaReverseKey.java
index 86d66db..e99d2cb 100644
--- a/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaReverseKey.java
+++ b/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaReverseKey.java
@@ -15,8 +15,8 @@
  */
 package org.commonjava.storage.pathmapped.pathdb.jpa.model;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Embeddable;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
 import java.io.Serializable;
 import java.util.Objects;
 
diff --git a/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaReverseMap.java b/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaReverseMap.java
index ccbe896..3773a21 100644
--- a/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaReverseMap.java
+++ b/pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaReverseMap.java
@@ -17,10 +17,10 @@
 
 import org.commonjava.storage.pathmapped.model.ReverseMap;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.EmbeddedId;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.Table;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
diff --git a/pom.xml b/pom.xml
index f58516e..545b9b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
     <properties>
         <projectOwner>Red Hat, Inc.</projectOwner>
         <projectEmail>nos-devel@redhat.com</projectEmail>
-        <javaVersion>11</javaVersion>
+        <javaVersion>1.8</javaVersion>
         <test-forkCount>1</test-forkCount>
         <cassandraVersion>3.12.1</cassandraVersion>
         <cassandraUnitVersion>3.11.2.0</cassandraUnitVersion>

From e9128e2aaa901e95cb159e56cf261dc319e7a7d0 Mon Sep 17 00:00:00 2001
From: Nick Cross <ncross@redhat.com>
Date: Thu, 23 Oct 2025 11:26:15 +0100
Subject: [PATCH 2/2] Move JDK back to 11

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 545b9b5..f58516e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
     <properties>
         <projectOwner>Red Hat, Inc.</projectOwner>
         <projectEmail>nos-devel@redhat.com</projectEmail>
-        <javaVersion>1.8</javaVersion>
+        <javaVersion>11</javaVersion>
         <test-forkCount>1</test-forkCount>
         <cassandraVersion>3.12.1</cassandraVersion>
         <cassandraUnitVersion>3.11.2.0</cassandraUnitVersion>