diff --git a/pom.xml b/pom.xml index cdbcf49..e192ac8 100644 --- a/pom.xml +++ b/pom.xml @@ -11,25 +11,26 @@ org.mitre.dsmiley.httpproxy smiley-http-proxy-servlet - 1.6 + 2.0 + org.imsglobal basiclti-util - 1.2.1-SNAPSHOT + 1.2.1-jakarta-SNAPSHOT commons-validator commons-validator - 1.4.1 + 1.9.0 - + - javax.servlet - servlet-api - 2.3 + jakarta.servlet + jakarta.servlet-api + 6.1.0 provided @@ -39,12 +40,17 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 - 1.8 - 1.8 + 17 + 17 + + org.apache.maven.plugins + maven-war-plugin + 3.4.0 + 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 @@ - - - + + xAPI LMS Integration