From 9e6c0a91180b8b3d33e52fd3ade9e788bf6bed46 Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 08:03:57 +0000
Subject: [PATCH] Upgrade to Java 17 and Jakarta EE 9+

- Update Java version from 1.8 to 17
- Update Maven compiler plugin from 3.8.1 to 3.11.0
- Add Maven war plugin 3.4.0 for Java 17 compatibility
- Replace javax.servlet:servlet-api:2.3 with jakarta.servlet:jakarta.servlet-api:6.1.0
- Update smiley-http-proxy-servlet from 1.6 to 2.0
- Update commons-validator from 1.4.1 to 1.9.0
- Update basiclti-util to 1.2.1-jakarta-SNAPSHOT (Jakarta EE compatible)
- Update web.xml schema from DTD 2.3 to Jakarta EE 6.0
- Migrate all javax.servlet imports to jakarta.servlet in Java files

Co-Authored-By: sandeep.parekh@codeium.com <sandeep.parekh@codeium.com>
---
 pom.xml                                       | 26 ++++++++++++-------
 .../developer/xapi/proxy/AuthFilter.java      |  4 +--
 .../developer/xapi/proxy/EndpointFilter.java  |  6 ++---
 .../developer/xapi/proxy/SSOServlet.java      |  2 +-
 src/main/webapp/WEB-INF/web.xml               | 10 +++----
 5 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index cdbcf49..e192ac8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,25 +11,26 @@
 		<dependency>
 			<groupId>org.mitre.dsmiley.httpproxy</groupId>
 			<artifactId>smiley-http-proxy-servlet</artifactId>
-			<version>1.6</version>
+			<version>2.0</version>
 		</dependency>
 		<!-- Apache 2.0 - https://github.com/IMSGlobal/basiclti-util-java -->
+		<!-- Using Jakarta EE compatible version built locally -->
 		<dependency>
 			<groupId>org.imsglobal</groupId>
 			<artifactId>basiclti-util</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.2.1-jakarta-SNAPSHOT</version>
 		</dependency>
 		<!--  Apache 2.0 - https://github.com/apache/commons-validator/ -->
 		<dependency>
 			<groupId>commons-validator</groupId>
 			<artifactId>commons-validator</artifactId>
-			<version>1.4.1</version>
+			<version>1.9.0</version>
 		</dependency>
-		<!-- Servlet Spec - for compile only -->
+		<!-- Jakarta Servlet API 6.1 (Jakarta EE 10) - for compile only -->
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.3</version>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
+			<version>6.1.0</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
@@ -39,12 +40,17 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.1</version>
+				<version>3.11.0</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>17</source>
+					<target>17</target>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>3.4.0</version>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/src/main/java/com/pearson/developer/xapi/proxy/AuthFilter.java b/src/main/java/com/pearson/developer/xapi/proxy/AuthFilter.java
index 9711e97..928c90f 100644
--- a/src/main/java/com/pearson/developer/xapi/proxy/AuthFilter.java
+++ b/src/main/java/com/pearson/developer/xapi/proxy/AuthFilter.java
@@ -30,8 +30,8 @@
 import java.util.Enumeration;
 import java.util.List;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
 
 import org.apache.commons.codec.binary.Base64;
 
diff --git a/src/main/java/com/pearson/developer/xapi/proxy/EndpointFilter.java b/src/main/java/com/pearson/developer/xapi/proxy/EndpointFilter.java
index 17f0c52..788a07d 100644
--- a/src/main/java/com/pearson/developer/xapi/proxy/EndpointFilter.java
+++ b/src/main/java/com/pearson/developer/xapi/proxy/EndpointFilter.java
@@ -25,8 +25,8 @@
 */
 package com.pearson.developer.xapi.proxy;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
 
 // Validates request are for xAPI endpoints
 public class EndpointFilter implements Filter {
@@ -65,4 +65,4 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
 	public void destroy() {
 
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/pearson/developer/xapi/proxy/SSOServlet.java b/src/main/java/com/pearson/developer/xapi/proxy/SSOServlet.java
index 6a767c2..efc49ec 100644
--- a/src/main/java/com/pearson/developer/xapi/proxy/SSOServlet.java
+++ b/src/main/java/com/pearson/developer/xapi/proxy/SSOServlet.java
@@ -29,7 +29,7 @@
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 
-import javax.servlet.http.*;
+import jakarta.servlet.http.*;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.validator.routines.EmailValidator;
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 6ff9276..a67490f 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,8 +1,8 @@
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd" >
-
-<web-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
+         version="6.0">
 	<display-name>xAPI LMS Integration</display-name>
 
 	<!-- ensures only xAPI request are sent to the proxy -->