From 9d340a81aa53a6a6bac66a7dfefd03853ac7ddf7 Mon Sep 17 00:00:00 2001
From: ismisepaul <ismisepaul@gmail.com>
Date: Thu, 4 Jun 2026 22:34:48 +0100
Subject: [PATCH 1/2] build: jakarta-ready dependencies (PR 1 of jakarta
 migration #861)

Build-config-only step of the javax -> jakarta migration. Does not
compile on its own (source still imports javax.*); the mechanical
import rename follows in the next sub-PR.

- jakarta.servlet:jakarta.servlet-api:6.0.0 (was javax.servlet:javax.servlet-api:4.0.1)
- jakarta JSTL 3.0 api + glassfish impl (was jstl:jstl:1.2)
- org.eclipse.angus:angus-mail:2.0.3 (was com.sun.mail:javax.mail:1.6.2)
- remove javax:javaee-api:8.0.1 (pulls the legacy javax namespace back in)
- align Spring to 6.1.21 (spring-test 5.3.31, spring-core 6.0.2,
  spring-context 5.3.31 were inconsistent)
- remove spring-mock:2.0.8 (Spring 6 spring-test provides the Jakarta mocks)
- remove fongo (unused; tests @Disabled, rescue tracked in #876)
- .env Tomcat base image 9.0 -> 10.1 (first Jakarta-namespace Tomcat)

Refs #861. Targets Spring 6.1.x (not 7) per discussion on #869.
---
 .env    |  2 +-
 pom.xml | 58 ++++++++++++++++++++++++++-------------------------------
 2 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/.env b/.env
index 9c189ff3b..40fae83d9 100644
--- a/.env
+++ b/.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
 
diff --git a/pom.xml b/pom.xml
index 303618e4c..b31ad81d9 100644
--- a/pom.xml
+++ b/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,7 +150,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
-			<version>5.3.31</version>
+			<version>6.1.21</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -155,30 +158,21 @@
 		<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 supersede 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 -->

From c53f6d32bae2ab897e623f4ddace2b883c40d7a1 Mon Sep 17 00:00:00 2001
From: Paul McCann <ismisepaul@gmail.com>
Date: Thu, 4 Jun 2026 22:48:10 +0100
Subject: [PATCH 2/2] Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b31ad81d9..2fcf4f27d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,7 +164,7 @@
 
 		<!-- spring-mock:2.0.8 removed: javax-era standalone mock (2008).
 		     Spring 6 spring-test provides the Jakarta MockHttpServletRequest /
-		     MockServletConfig that supersede it.
+		     MockServletConfig that supersedes it.
 		     fongo removed: unmaintained and unused (its only tests are @Disabled);
 		     test rescue tracked in #876. -->