[ismisepaul]

PR 4 of the Jakarta migration stack (#861)

Stacked on #935 (PR 3).

Why retarget

The integration branch targeted Jakarta EE 10 / Spring 6.1. Spring 6.1's OSS support ended June 2025 and 6.2's ended June 2026; 7.0 is the only OSS-supported line, and it is built against Jakarta EE 11 (Servlet 6.1). EE 10 → EE 11 keeps the same jakarta.* namespace, so none of the PR 2 rename changes.

Changes

• jakarta.servlet-api 6.0.0 → 6.1.0
• Tomcat image 10.1-jre17-temurin → 11.0-jre17-temurin (.env; Tomcat 11 implements Servlet 6.1 and needs Java 17, which we already build with)
• Spring 6.1.21 → 7.0.10, now set once via a spring.version property
• spring-context moved to test scope — nothing in src/main imports Spring; it's only used for spring-test's Mock* servlet classes in 36 test files
• Patch bumps: jakarta.servlet.jsp.jstl-api 3.0.0 → 3.0.2, angus-mail 2.0.3 → 2.0.5
• Tomcat 11 config patches (moved here from PR 6 so the image build works wherever the Tomcat 11 image is used):
  • docker/tomcat/serverxml.patch regenerated against Tomcat 11.0.27. The old one failed a hunk on Tomcat 11, which broke docker compose build. The HTTPS connector now uses <SSLHostConfig>/<Certificate> instead of the legacy Connector keystore attributes.
  • docker/tomcat/webxml.patch regenerated as an exact diff (GNU patch previously needed fuzz 2 at a −4108-line offset).
  • Dockerfile placeholder substitution updated for the new attribute names.
  • Both patches are verified with the base image's own GNU patch, and in a full Docker smoke test on Tomcat 11.0.27.

Verification

• Main build still fails only on the 4 SAML servlets (fixed in PR 5).
• With the 5 SAML servlets and LogoutIT temporarily removed in a scratch copy, mvn test-compile is clean and mvn test: 169 run, 0 failures, 2 skipped (same skips as before) on Temurin 17.

Upgrading an existing Docker environment needs the conf volume removed (documented in PR 8).

Please merge with a merge commit (stack branches can't be force-pushed).

Refs #861

🤖 Generated with Claude Code

[Copilot]

🔵 Needs a closer look

Full-stack compatibility remains unverified while SAML build fixes and Tomcat 11 runtime validation are deferred to later stacked PRs.

No open issues 🎉

What changed in this PR

This fourth PR in the Jakarta migration stack (#861), stacked on #935, aligns build dependencies and the container image with Jakarta EE 11.

Changes:

• Upgrades to Servlet 6.1, Spring 7.0.10, and Tomcat 11.
• Centralizes Spring versions and moves spring-context to test scope.
• Updates JSTL API and Angus Mail patch versions.

File	Description
pom.xml	Updates Jakarta and Spring dependencies and limits Spring Context to tests.
.env	Selects the Tomcat 11 Java 17 container image.

_{Review effort: Balanced}

[Copilot]

🔵 Needs a closer look

The runtime and TLS upgrade needs final human validation with the complete migration stack once the pending SAML changes restore a clean build.

No open issues 🎉

_{Review effort: Balanced}