Skip to content

Commit 6492b65

Browse files
authored
Merge pull request #125 from rnc/PERSISTENCE
Revert "Update to jakarta namespace for jpa module (#115)"
2 parents ae4e9e4 + e9128e2 commit 6492b65

File tree

8 files changed

+27
-27
lines changed

8 files changed

+27
-27
lines changed

pathdb/jpa/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
<dependencies>
3030
<!-- JPA support-->
3131
<dependency>
32-
<groupId>jakarta.persistence</groupId>
33-
<artifactId>jakarta.persistence-api</artifactId>
34-
<version>3.1.0</version>
32+
<groupId>javax.persistence</groupId>
33+
<artifactId>javax.persistence-api</artifactId>
34+
<version>2.2</version>
3535
</dependency>
3636

3737
<!--Test-->

pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/JPAPathDB.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
import org.slf4j.Logger;
3030
import org.slf4j.LoggerFactory;
3131

32-
import jakarta.persistence.EntityManager;
33-
import jakarta.persistence.EntityManagerFactory;
34-
import jakarta.persistence.Persistence;
35-
import jakarta.persistence.Query;
32+
import javax.persistence.EntityManager;
33+
import javax.persistence.EntityManagerFactory;
34+
import javax.persistence.Persistence;
35+
import javax.persistence.Query;
3636
import java.util.ArrayList;
3737
import java.util.Collection;
3838
import java.util.Collections;

pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaFileChecksum.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
import org.commonjava.storage.pathmapped.model.FileChecksum;
1919

20-
import jakarta.persistence.Column;
21-
import jakarta.persistence.Entity;
22-
import jakarta.persistence.Id;
23-
import jakarta.persistence.Table;
20+
import javax.persistence.Column;
21+
import javax.persistence.Entity;
22+
import javax.persistence.Id;
23+
import javax.persistence.Table;
2424
import java.util.Objects;
2525

2626
@Entity

pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaPathKey.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package org.commonjava.storage.pathmapped.pathdb.jpa.model;
1717

18-
import jakarta.persistence.Column;
19-
import jakarta.persistence.Embeddable;
18+
import javax.persistence.Column;
19+
import javax.persistence.Embeddable;
2020
import java.io.Serializable;
2121
import java.util.Objects;
2222

pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaPathMap.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
import org.commonjava.storage.pathmapped.model.PathMap;
1919

20-
import jakarta.persistence.Column;
21-
import jakarta.persistence.EmbeddedId;
22-
import jakarta.persistence.Entity;
23-
import jakarta.persistence.Table;
20+
import javax.persistence.Column;
21+
import javax.persistence.EmbeddedId;
22+
import javax.persistence.Entity;
23+
import javax.persistence.Table;
2424
import java.util.Date;
2525
import java.util.Objects;
2626

pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaReclaim.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
import org.commonjava.storage.pathmapped.model.Reclaim;
1919

20-
import jakarta.persistence.Column;
21-
import jakarta.persistence.Entity;
22-
import jakarta.persistence.Id;
23-
import jakarta.persistence.Table;
20+
import javax.persistence.Column;
21+
import javax.persistence.Entity;
22+
import javax.persistence.Id;
23+
import javax.persistence.Table;
2424
import java.util.Date;
2525
import java.util.Objects;
2626

pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaReverseKey.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package org.commonjava.storage.pathmapped.pathdb.jpa.model;
1717

18-
import jakarta.persistence.Column;
19-
import jakarta.persistence.Embeddable;
18+
import javax.persistence.Column;
19+
import javax.persistence.Embeddable;
2020
import java.io.Serializable;
2121
import java.util.Objects;
2222

pathdb/jpa/src/main/java/org/commonjava/storage/pathmapped/pathdb/jpa/model/JpaReverseMap.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
import org.commonjava.storage.pathmapped.model.ReverseMap;
1919

20-
import jakarta.persistence.Column;
21-
import jakarta.persistence.EmbeddedId;
22-
import jakarta.persistence.Entity;
23-
import jakarta.persistence.Table;
20+
import javax.persistence.Column;
21+
import javax.persistence.EmbeddedId;
22+
import javax.persistence.Entity;
23+
import javax.persistence.Table;
2424
import java.util.HashSet;
2525
import java.util.Objects;
2626
import java.util.Set;

0 commit comments

Comments
 (0)