Skip to content

Upgrade to Java 17 and Jakarta EE 9+ #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devin-ai-integration wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade to Java 17 and Jakarta EE 9+ #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
4 changes: 2 additions & 2 deletions src/main/java/com/pearson/developer/xapi/proxy/AuthFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/pearson/developer/xapi/proxy/EndpointFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -65,4 +65,4 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
public void destroy() {

}
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/pearson/developer/xapi/proxy/SSOServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 -->
Expand Down