Skip to content

Commit 26ea824

Browse files
authored
Update to jakarta namespace for jpa module (#115)
* Update to jakarta namespace for jpa module * Update github action to use java 11
1 parent a67f4ea commit 26ea824

11 files changed

Lines changed: 30 additions & 30 deletions

File tree

.github/workflows/merge-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Set up JDK
3737
uses: actions/setup-java@v2
3838
with:
39-
java-version: '8'
39+
java-version: '11'
4040
distribution: 'adopt'
4141
# server-id: sonatype
4242
# server-username: SONATYPE_BOT_USERNAME

.github/workflows/pr-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Set up JDK
3333
uses: actions/setup-java@v2
3434
with:
35-
java-version: '8'
35+
java-version: '11'
3636
distribution: 'adopt'
3737

3838
- name: maven-settings-xml-action

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>javax.persistence</groupId>
33-
<artifactId>javax.persistence-api</artifactId>
34-
<version>2.2</version>
32+
<groupId>jakarta.persistence</groupId>
33+
<artifactId>jakarta.persistence-api</artifactId>
34+
<version>3.1.0</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
@@ -28,10 +28,10 @@
2828
import org.slf4j.Logger;
2929
import org.slf4j.LoggerFactory;
3030

31-
import javax.persistence.EntityManager;
32-
import javax.persistence.EntityManagerFactory;
33-
import javax.persistence.Persistence;
34-
import javax.persistence.Query;
31+
import jakarta.persistence.EntityManager;
32+
import jakarta.persistence.EntityManagerFactory;
33+
import jakarta.persistence.Persistence;
34+
import jakarta.persistence.Query;
3535
import java.util.ArrayList;
3636
import java.util.Collection;
3737
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 javax.persistence.Column;
21-
import javax.persistence.Entity;
22-
import javax.persistence.Id;
23-
import javax.persistence.Table;
20+
import jakarta.persistence.Column;
21+
import jakarta.persistence.Entity;
22+
import jakarta.persistence.Id;
23+
import jakarta.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 javax.persistence.Column;
19-
import javax.persistence.Embeddable;
18+
import jakarta.persistence.Column;
19+
import jakarta.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 javax.persistence.Column;
21-
import javax.persistence.EmbeddedId;
22-
import javax.persistence.Entity;
23-
import javax.persistence.Table;
20+
import jakarta.persistence.Column;
21+
import jakarta.persistence.EmbeddedId;
22+
import jakarta.persistence.Entity;
23+
import jakarta.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 javax.persistence.Column;
21-
import javax.persistence.Entity;
22-
import javax.persistence.Id;
23-
import javax.persistence.Table;
20+
import jakarta.persistence.Column;
21+
import jakarta.persistence.Entity;
22+
import jakarta.persistence.Id;
23+
import jakarta.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 javax.persistence.Column;
19-
import javax.persistence.Embeddable;
18+
import jakarta.persistence.Column;
19+
import jakarta.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 javax.persistence.Column;
21-
import javax.persistence.EmbeddedId;
22-
import javax.persistence.Entity;
23-
import javax.persistence.Table;
20+
import jakarta.persistence.Column;
21+
import jakarta.persistence.EmbeddedId;
22+
import jakarta.persistence.Entity;
23+
import jakarta.persistence.Table;
2424
import java.util.HashSet;
2525
import java.util.Objects;
2626
import java.util.Set;

0 commit comments

Comments
 (0)