javax.persistence --> jakarta.persistence

refs #1691

pom.xml

@@ -494,9 +494,9 @@
    <version>${hibernate.version}</version>
   </dependency>
   <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.0.0</version>
   </dependency>
 
   <!-- Audio Metadata -->

src/main/java/ai/elimu/dao/jpa/ApplicationDaoJpa.java

@@ -1,7 +1,7 @@
 package ai.elimu.dao.jpa;
 
 import java.util.List;
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 import ai.elimu.dao.ApplicationDao;
 import ai.elimu.model.admin.Application;
 

src/main/java/ai/elimu/dao/jpa/ApplicationVersionDaoJpa.java

@@ -1,7 +1,7 @@
 package ai.elimu.dao.jpa;
 
 import java.util.List;
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 import ai.elimu.dao.ApplicationVersionDao;
 import ai.elimu.model.admin.Application;
 import ai.elimu.model.admin.ApplicationVersion;

src/main/java/ai/elimu/dao/jpa/AudioDaoJpa.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 import ai.elimu.dao.AudioDao;
 import ai.elimu.model.content.StoryBookParagraph;
 import ai.elimu.model.content.Word;

src/main/java/ai/elimu/dao/jpa/AudioPeerReviewEventDaoJpa.java

@@ -6,7 +6,7 @@
 import ai.elimu.model.contributor.AudioPeerReviewEvent;
 import ai.elimu.model.contributor.Contributor;
 import java.util.List;
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 import org.springframework.dao.DataAccessException;
 
 public class AudioPeerReviewEventDaoJpa extends GenericDaoJpa<AudioPeerReviewEvent> implements AudioPeerReviewEventDao {

src/main/java/ai/elimu/dao/jpa/ContributorDaoJpa.java

@@ -2,7 +2,7 @@
 
 import java.util.Calendar;
 import java.util.List;
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 import ai.elimu.dao.ContributorDao;
 
 import org.springframework.dao.DataAccessException;

src/main/java/ai/elimu/dao/jpa/DbMigrationDaoJpa.java

@@ -1,7 +1,7 @@
 package ai.elimu.dao.jpa;
 
 import java.util.List;
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 import ai.elimu.dao.DbMigrationDao;
 
 import org.springframework.dao.DataAccessException;

src/main/java/ai/elimu/dao/jpa/DeviceDaoJpa.java

@@ -1,6 +1,6 @@
 package ai.elimu.dao.jpa;
 
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 import ai.elimu.dao.DeviceDao;
 
 import org.springframework.dao.DataAccessException;

src/main/java/ai/elimu/dao/jpa/EmojiDaoJpa.java

@@ -1,7 +1,7 @@
 package ai.elimu.dao.jpa;
 
 import java.util.List;
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 import ai.elimu.dao.EmojiDao;
 
 import org.springframework.dao.DataAccessException;

src/main/java/ai/elimu/dao/jpa/GenericDaoJpa.java

@@ -4,8 +4,8 @@
 import java.lang.reflect.Type;
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Repository;

src/main/java/ai/elimu/dao/jpa/ImageDaoJpa.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 
 import org.springframework.dao.DataAccessException;
 

src/main/java/ai/elimu/dao/jpa/LetterDaoJpa.java

@@ -1,7 +1,7 @@
 package ai.elimu.dao.jpa;
 
 import java.util.List;
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 import ai.elimu.dao.LetterDao;
 
 import org.springframework.dao.DataAccessException;

src/main/java/ai/elimu/dao/jpa/LetterLearningEventDaoJpa.java

@@ -5,7 +5,7 @@
 import ai.elimu.model.analytics.LetterLearningEvent;
 import ai.elimu.model.content.Letter;
 import java.util.Calendar;
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 import org.springframework.dao.DataAccessException;
 
 public class LetterLearningEventDaoJpa extends GenericDaoJpa<LetterLearningEvent> implements LetterLearningEventDao {

src/main/java/ai/elimu/dao/jpa/NumberDaoJpa.java

@@ -1,7 +1,7 @@
 package ai.elimu.dao.jpa;
 
 import java.util.List;
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 
 import org.springframework.dao.DataAccessException;
 

src/main/java/ai/elimu/dao/jpa/SoundDaoJpa.java

@@ -1,7 +1,7 @@
 package ai.elimu.dao.jpa;
 
 import java.util.List;
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 import ai.elimu.model.content.Sound;
 
 import org.springframework.dao.DataAccessException;

src/main/java/ai/elimu/dao/jpa/StoryBookDaoJpa.java

@@ -1,7 +1,7 @@
 package ai.elimu.dao.jpa;
 
 import java.util.List;
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 import ai.elimu.dao.StoryBookDao;
 
 import org.springframework.dao.DataAccessException;

src/main/java/ai/elimu/dao/jpa/StoryBookLearningEventDaoJpa.java

@@ -6,7 +6,7 @@
 import ai.elimu.model.content.StoryBook;
 import java.util.Calendar;
 import java.util.List;
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 import org.springframework.dao.DataAccessException;
 
 public class StoryBookLearningEventDaoJpa extends GenericDaoJpa<StoryBookLearningEvent> implements StoryBookLearningEventDao {

src/main/java/ai/elimu/dao/jpa/SyllableDaoJpa.java

@@ -1,7 +1,7 @@
 package ai.elimu.dao.jpa;
 
 import java.util.List;
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 import ai.elimu.dao.SyllableDao;
 
 import org.springframework.dao.DataAccessException;

src/main/java/ai/elimu/dao/jpa/VideoDaoJpa.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 import ai.elimu.dao.VideoDao;
 
 import org.springframework.dao.DataAccessException;

src/main/java/ai/elimu/dao/jpa/WordDaoJpa.java

@@ -1,8 +1,8 @@
 package ai.elimu.dao.jpa;
 
 import java.util.List;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.Query;
 
 import ai.elimu.model.v2.enums.content.WordType;
 import org.springframework.dao.DataAccessException;

src/main/java/ai/elimu/dao/jpa/WordLearningEventDaoJpa.java

@@ -5,7 +5,7 @@
 import ai.elimu.model.analytics.WordLearningEvent;
 import ai.elimu.model.content.Word;
 import java.util.Calendar;
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 import org.springframework.dao.DataAccessException;
 
 public class WordLearningEventDaoJpa extends GenericDaoJpa<WordLearningEvent> implements WordLearningEventDao {

src/main/java/ai/elimu/model/BaseEntity.java

@@ -1,10 +1,10 @@
 package ai.elimu.model;
 
 import java.io.Serializable;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
 
 @MappedSuperclass
 public abstract class BaseEntity implements Serializable {

src/main/java/ai/elimu/model/DbMigration.java

@@ -1,10 +1,10 @@
 package ai.elimu.model;
 
 import java.util.Calendar;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import jakarta.validation.constraints.NotNull;
 
 @Entity

src/main/java/ai/elimu/model/Device.java

@@ -1,10 +1,10 @@
 package ai.elimu.model;
 
 import java.util.Calendar;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import jakarta.validation.constraints.NotNull;
 
 @Entity

src/main/java/ai/elimu/model/admin/Application.java

@@ -1,12 +1,12 @@
 package ai.elimu.model.admin;
 
 import java.util.Set;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
 import jakarta.validation.constraints.NotNull;
 import ai.elimu.model.BaseEntity;
 import ai.elimu.model.contributor.Contributor;

src/main/java/ai/elimu/model/admin/ApplicationVersion.java

@@ -1,12 +1,12 @@
 package ai.elimu.model.admin;
 
 import java.util.Calendar;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Lob;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import jakarta.validation.constraints.NotNull;
 import ai.elimu.model.BaseEntity;
 import ai.elimu.model.contributor.Contributor;

src/main/java/ai/elimu/model/analytics/LearningEvent.java

@@ -4,12 +4,12 @@
 import ai.elimu.model.admin.Application;
 import ai.elimu.model.v2.enums.analytics.LearningEventType;
 import java.util.Calendar;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.ManyToOne;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import jakarta.validation.constraints.NotNull;
 
 @MappedSuperclass

src/main/java/ai/elimu/model/analytics/LetterLearningEvent.java

@@ -1,8 +1,8 @@
 package ai.elimu.model.analytics;
 
 import ai.elimu.model.content.Letter;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
 import jakarta.validation.constraints.NotNull;
 
 @Entity

src/main/java/ai/elimu/model/analytics/StoryBookLearningEvent.java

@@ -1,8 +1,8 @@
 package ai.elimu.model.analytics;
 
 import ai.elimu.model.content.StoryBook;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
 import jakarta.validation.constraints.NotNull;
 
 @Entity

src/main/java/ai/elimu/model/analytics/WordLearningEvent.java

@@ -1,8 +1,8 @@
 package ai.elimu.model.analytics;
 
 import ai.elimu.model.content.Word;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
 
 @Entity
 public class WordLearningEvent extends LearningEvent {

src/main/java/ai/elimu/model/content/Content.java

@@ -1,11 +1,11 @@
 package ai.elimu.model.content;
 
 import java.util.Calendar;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import jakarta.validation.constraints.NotNull;
 import ai.elimu.model.BaseEntity;
 import ai.elimu.model.v2.enums.content.ContentStatus;

src/main/java/ai/elimu/model/content/Emoji.java

@@ -1,12 +1,12 @@
 package ai.elimu.model.content;
 
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
 import jakarta.validation.constraints.NotNull;
 import org.hibernate.validator.constraints.Length;
 

src/main/java/ai/elimu/model/content/Letter.java

@@ -1,7 +1,7 @@
 package ai.elimu.model.content;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
 import jakarta.validation.constraints.NotNull;
 import org.hibernate.validator.constraints.Length;
 

src/main/java/ai/elimu/model/content/LetterSound.java

@@ -1,10 +1,10 @@
 package ai.elimu.model.content;
 
 import java.util.List;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToMany;
-import javax.persistence.OrderColumn;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.OrderColumn;
 import org.hibernate.validator.constraints.NotEmpty;
 
 /**