Update to jakarta namespace for jpa module (#115)

* Update to jakarta namespace for jpa module * Update github action to use java 11
Commonjava · Jun 11, 2024 · 26ea824 · 26ea824
1 parent a67f4ea
commit 26ea824
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 30 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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/...jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaFileChecksum.java b/...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
@@ -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
@@ -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
@@ -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/...b/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaReverseKey.java b/...b/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/...b/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaReverseMap.java b/...b/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
@@ -49,7 +49,7 @@
     <properties>
         <projectOwner>Red Hat, Inc.</projectOwner>
         <projectEmail>[email protected]</projectEmail>
-        <javaVersion>1.8</javaVersion>
+        <javaVersion>11</javaVersion>
         <test-forkCount>1</test-forkCount>
         <datastaxVersion>3.7.2</datastaxVersion>
         <cassandraUnitVersion>3.11.2.0</cassandraUnitVersion>