From 26ea82435f58768bdfa338f34dbbf736949fa05c Mon Sep 17 00:00:00 2001
From: Rui Han <ruhan@redhat.com>
Date: Tue, 11 Jun 2024 16:43:14 +0800
Subject: [PATCH] Update to jakarta namespace for jpa module (#115)

* Update to jakarta namespace for jpa module

* Update github action to use java 11
---
 .github/workflows/merge-build.yml                         | 2 +-
 .github/workflows/pr-build.yml                            | 2 +-
 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 +-
 11 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/merge-build.yml b/.github/workflows/merge-build.yml
index d804e35..a8de422 100644
--- a/.github/workflows/merge-build.yml
+++ b/.github/workflows/merge-build.yml
@@ -36,7 +36,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v2
       with:
-        java-version: '8'
+        java-version: '11'
         distribution: 'adopt'
         # server-id: sonatype
         # server-username: SONATYPE_BOT_USERNAME
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index d9e53de..0e44af9 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -32,7 +32,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v2
       with:
-        java-version: '8'
+        java-version: '11'
         distribution: 'adopt'
 
     - name: maven-settings-xml-action
diff --git a/pathdb/jpa/pom.xml b/pathdb/jpa/pom.xml
index 1ec111d..6eca89c 100644
--- a/pathdb/jpa/pom.xml
+++ b/pathdb/jpa/pom.xml
@@ -29,9 +29,9 @@
     <dependencies>
         <!-- JPA support-->
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>javax.persistence-api</artifactId>
-            <version>2.2</version>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>3.1.0</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 58720a2..3875ff9 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
@@ -28,10 +28,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
+import jakarta.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 6257828..366f09b 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 javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.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 3c1cb19..6f37113 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 javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.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 6ccc441..54b14e1 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 javax.persistence.Column;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.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 90522c7..02a459d 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 javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.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 e99d2cb..86d66db 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 javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.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 3773a21..ccbe896 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 javax.persistence.Column;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
diff --git a/pom.xml b/pom.xml
index 394265d..a358caf 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>
         <datastaxVersion>3.7.2</datastaxVersion>
         <cassandraUnitVersion>3.11.2.0</cassandraUnitVersion>