Migrate javax.* → jakarta.* (Jakarta EE 9+ / Servlet 6.0 / Tomcat 10.1)

.env

@@ -1,6 +1,6 @@
 VERSION=3.1
 
-TOMCAT_DOCKER_VERSION=9.0-jre17-temurin
+TOMCAT_DOCKER_VERSION=10.1-jre17-temurin
 DB_VERSION=10.6.11
 MONGODB_VERSION=4.1.13
 

pom.xml

@@ -68,11 +68,11 @@
 			<artifactId>jtidy</artifactId>
 			<version>r938</version>
 		</dependency>
-		<!-- https://mvnrepository.com/artifact/javax.mail/mail -->
+		<!-- Jakarta Mail (was com.sun.mail:javax.mail) - jakarta.mail namespace -->
 		<dependency>
-		<groupId>com.sun.mail</groupId>
-		<artifactId>javax.mail</artifactId>
-		<version>1.6.2</version>
+		<groupId>org.eclipse.angus</groupId>
+		<artifactId>angus-mail</artifactId>
+		<version>2.0.3</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.mongodb/mongo-java-driver -->
@@ -81,23 +81,26 @@
 			<artifactId>mongo-java-driver</artifactId>
 		<version>3.12.14</version>
 		</dependency>
+		<!-- Jakarta Servlet 6.0 (Tomcat 10.1) - was javax.servlet:javax.servlet-api.
+		     The javax:javaee-api umbrella dependency was removed: it pulls the
+		     legacy javax.* namespace back onto the classpath. -->
 		<dependency>
-			<groupId>javax</groupId>
-			<artifactId>javaee-api</artifactId>
-			<version>8.0.1</version>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
+			<version>6.0.0</version>
 			<scope>provided</scope>
 		</dependency>
+
+		<!-- Jakarta JSTL 3.0 (jakarta.tags.*) - was jstl:jstl:1.2 -->
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>4.0.1</version>
-			<scope>provided</scope>
+			<groupId>jakarta.servlet.jsp.jstl</groupId>
+			<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+			<version>3.0.0</version>
 		</dependency>
-
 		<dependency>
-			<groupId>jstl</groupId>
-			<artifactId>jstl</artifactId>
-			<version>1.2</version>
+			<groupId>org.glassfish.web</groupId>
+			<artifactId>jakarta.servlet.jsp.jstl</artifactId>
+			<version>3.0.1</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
@@ -147,38 +150,29 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
-			<version>5.3.31</version>
+			<version>6.1.21</version>
 			<scope>test</scope>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.springframework/spring-core -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<version>6.0.2</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- https://mvnrepository.com/artifact/org.springframework/spring-mock -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-mock</artifactId>
-			<version>2.0.8</version>
+			<version>6.1.21</version>
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>com.github.fakemongo</groupId>
-			<artifactId>fongo</artifactId>
-			<version>2.1.1</version>
-			<scope>test</scope>
-		</dependency>
+		<!-- spring-mock:2.0.8 removed: javax-era standalone mock (2008).
+		     Spring 6 spring-test provides the Jakarta MockHttpServletRequest /
+		     MockServletConfig that supersedes it.
+		     fongo removed: unmaintained and unused (its only tests are @Disabled);
+		     test rescue tracked in #876. -->
 
 		<!-- https://mvnrepository.com/artifact/org.springframework/spring-context -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>5.3.31</version>
+			<version>6.1.21</version>
 		</dependency>
 
 		<!-- Test -->

src/it/java/servlets/LoginIT.java

@@ -7,7 +7,7 @@
 import dbProcs.Setter;
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/it/java/servlets/LogoutIT.java

@@ -5,7 +5,7 @@
 import dbProcs.GetterIT;
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/it/java/servlets/SetupIT.java

@@ -12,7 +12,7 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.commons.io.FileUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

src/it/java/servlets/admin/config/DisableCheatsIT.java

@@ -6,7 +6,7 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/it/java/servlets/admin/config/DisableFeedbackIT.java

@@ -4,7 +4,7 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/it/java/servlets/admin/config/DisableScoreboardIT.java

@@ -4,7 +4,7 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/it/java/servlets/admin/config/EnableCheatsIT.java

@@ -4,7 +4,7 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/it/java/servlets/admin/config/EnableFeedbackIT.java

@@ -4,7 +4,7 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/it/java/servlets/admin/config/SetCtfModeIT.java

@@ -4,7 +4,7 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/it/java/servlets/admin/config/SetOpenFloorModeIT.java

@@ -4,7 +4,7 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/it/java/servlets/admin/config/SetTournamentModeIT.java

@@ -4,7 +4,7 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/it/java/servlets/admin/config/ToggleRegistrationIT.java

@@ -4,7 +4,7 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/it/java/servlets/admin/moduleManagement/CloseAllModulesTestIT.java

@@ -4,7 +4,7 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/it/java/servlets/admin/moduleManagement/EnableModuleBlockIT.java

@@ -4,7 +4,7 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/it/java/servlets/admin/moduleManagement/GetFeedbackIT.java

@@ -5,7 +5,7 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/it/java/servlets/admin/moduleManagement/GetJsonProgressIT.java

@@ -4,7 +4,7 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/it/java/servlets/admin/moduleManagement/OpenAllModulesIT.java

@@ -6,7 +6,7 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/it/java/servlets/admin/moduleManagement/OpenOrCloseByCategoryIT.java

@@ -5,7 +5,7 @@
 import dbProcs.Setter;
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/it/java/servlets/admin/userManagement/DeletePlayersIT.java

@@ -6,7 +6,7 @@
 import dbProcs.Setter;
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/it/java/servlets/api/LevelsIT.java

@@ -5,7 +5,7 @@
 import dbProcs.Setter;
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.json.JSONArray;

src/it/java/servlets/module/GetModuleIT.java

@@ -6,7 +6,7 @@
 import dbProcs.Setter;
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/it/java/servlets/module/challenge/BrokenCryptoHomeMadeIT.java

@@ -8,7 +8,7 @@
 import java.sql.SQLException;
 import java.util.Locale;
 import java.util.ResourceBundle;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/it/java/servlets/module/challenge/NoSqlInjection1IT.java

@@ -6,7 +6,7 @@
 import dbProcs.Setter;
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/it/java/servlets/module/lesson/CsrfLessonIT.java

@@ -6,7 +6,7 @@
 import dbProcs.Setter;
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/it/java/servlets/module/lesson/SessionManagementLessonIT.java

@@ -6,7 +6,7 @@
 import dbProcs.Setter;
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.http.Cookie;
+import jakarta.servlet.http.Cookie;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;

src/main/java/listeners/DatabaseLifecycleListener.java

@@ -2,9 +2,9 @@
 
 import dbProcs.ConnectionPool;
 import dbProcs.MongoDatabase;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.annotation.WebListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.annotation.WebListener;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import servlets.Setup;

src/main/java/servlets/ACS.java

@@ -10,12 +10,12 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

src/main/java/servlets/ChangePassword.java

@@ -4,12 +4,12 @@
 import dbProcs.Setter;
 import java.io.IOException;
 import java.math.BigInteger;
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import utils.ShepherdLogManager;