refactor: upgrade to hibernate 6

pom.xml

@@ -10,9 +10,9 @@
         <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <model.version>2.0.74</model.version>
-        <hibernate.version>5.6.15.Final</hibernate.version>
-        <jetty.version>10.0.22</jetty.version>
-        <spring.version>5.3.18</spring.version>
+        <hibernate.version>6.1.7.Final</hibernate.version>
+        <jetty.version>11.0.24</jetty.version>
+        <spring.version>6.0.8</spring.version>
         <surefire-plugin.version>3.1.2</surefire-plugin.version>
     </properties>
 
@@ -352,11 +352,6 @@
         </dependency>
 
         <!-- Apache Commons -->
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>1.4</version>
-        </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
@@ -462,49 +457,39 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.2</version>
+            <groupId>jakarta.servlet.jsp.jstl</groupId>
+            <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.web</groupId>
+            <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+            <version>3.0.1</version>
         </dependency>
 
         <!-- Hibernate (ORM) -->
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>
             <version>${hibernate.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>${hibernate.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-tools</artifactId>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-ant</artifactId>
             <version>${hibernate.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>6.1.7.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>2.0.1.Final</version>
+            <version>7.0.0.Final</version>
         </dependency>
 
         <!-- Database -->
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>javax.persistence-api</artifactId>
-            <version>2.2</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.transaction</groupId>
-            <artifactId>jta</artifactId>
-            <version>1.1</version>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.hsqldb</groupId>
@@ -524,15 +509,15 @@
 
         <!-- Provided by Jetty -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>4.0.1</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>5.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>javax.servlet.jsp-api</artifactId>
-            <version>2.3.3</version>
+            <groupId>jakarta.servlet.jsp</groupId>
+            <artifactId>jakarta.servlet.jsp-api</artifactId>
+            <version>3.0.0</version>
             <scope>provided</scope>
         </dependency>
 

src/main/config/DEPLOY.md

@@ -29,7 +29,7 @@ Version: `17`
 
 We use [Eclipse Jetty](https://jetty.org/) as our web server.
 
-Version: `Jetty 10.0.22` (requires Java 11 or newer)
+Version: `Jetty 11.0.24` (requires Java 11 or newer)
 
 ### Jetty Maven Plugin 🪶
 
@@ -45,23 +45,23 @@ You can find the download links for each release at https://jetty.org/download.h
 On your production server, go to the temporary folder, and download the release:
 
     cd /tmp
-    wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/10.0.22/jetty-home-10.0.22.tar.gz
+    wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/11.0.24/jetty-home-11.0.24.tar.gz
 
 Extract the archive:
 
-    tar -zxvf jetty-home-10.0.22.tar.gz
+    tar -zxvf jetty-home-11.0.24.tar.gz
 
 Move the folder to `/opt`:
 
-    mv jetty-home-10.0.22 /opt/
+    mv jetty-home-11.0.24 /opt/
 
 ### Configure Jetty ⚙️
 
 #### System Startup
 
 Add the `jetty` service:
 
-    ln -s /opt/jetty-home-10.0.22/bin/jetty.sh /etc/rc.d/init.d/jetty
+    ln -s /opt/jetty-home-11.0.24/bin/jetty.sh /etc/rc.d/init.d/jetty
 
 Enable the `jetty` server on system init:
 
@@ -80,7 +80,7 @@ Create the folder that will contain Jetty configuration and `*.war` files:
 Add Jetty modules:
 
     cd /opt/jetty-base/
-    java -jar /opt/jetty-home-10.0.22/start.jar --add-module=server,http,deploy,jsp
+    java -jar /opt/jetty-home-11.0.24/start.jar --add-module=server,http,deploy,jsp
 
 #### Set Default Values
 
@@ -102,7 +102,7 @@ Copy the port number configuration from [`centos-stream-9/opt/jetty-base/start.d
 
 Add the latest release of your `*.war` file to `/opt/jetty-base/webapps/`. In our case, we download WAR releases from an external URL:
 
-    wget -O /opt/jetty-base/webapps/webapp.war https://jitpack.io/com/github/elimu-ai/webapp/webapp-2.4.25/webapp-webapp-2.4.25.war
+    wget -O /opt/jetty-base/webapps/webapp.war https://jitpack.io/com/github/elimu-ai/webapp/webapp-2.4.66/webapp-webapp-2.4.66.war
 
 > [!IMPORTANT]
 > The WAR file's name must match the context file's name, e.g. `webapp.war` and `webapp.xml`.
@@ -123,7 +123,7 @@ Start the `jetty` service:
     systemctl start jetty
 
 > [!TIP]
-> To verify that everything has been configured correctly, you can run `cd /opt/jetty-base/; java -jar /opt/jetty-home-10.0.22/start.jar --list-config` and `systemctl status jetty`
+> To verify that everything has been configured correctly, you can run `cd /opt/jetty-base/; java -jar /opt/jetty-home-11.0.24/start.jar --list-config` and `systemctl status jetty`
 
 ## MariaDB Database 🛢️
 

src/main/config/centos-stream-9/etc/default/jetty

@@ -1,2 +1,2 @@
-JETTY_HOME=/opt/jetty-home-10.0.22
+JETTY_HOME=/opt/jetty-home-11.0.24
 JETTY_BASE=/opt/jetty-base

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/VideoLearningEventDaoJpa.java

@@ -6,7 +6,7 @@
 import java.util.Calendar;
 import java.util.List;
 
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 import org.springframework.dao.DataAccessException;
 
 public class VideoLearningEventDaoJpa extends GenericDaoJpa<VideoLearningEvent> implements VideoLearningEventDao {

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 {