File javax2jakarta.patch of Package java-saml
Index: src/java-saml-2.4.0/samples/java-saml-tookit-jspsample/pom.xml
===================================================================
--- src.orig/java-saml-2.4.0/samples/java-saml-tookit-jspsample/pom.xml
+++ src/java-saml-2.4.0/samples/java-saml-tookit-jspsample/pom.xml
@@ -17,10 +17,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- <scope>provided</scope>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>5.0.0</version>
</dependency>
</dependencies>
Index: src/java-saml-2.4.0/pom.xml
===================================================================
--- src.orig/java-saml-2.4.0/pom.xml
+++ src/java-saml-2.4.0/pom.xml
@@ -85,8 +85,8 @@
<version>3.2.5</version>
</requireMavenVersion>
<requireJavaVersion>
- <!-- enforce =1.7 so that we compile against the right JRE -->
- <version>[1.7,)</version>
+ <!-- enforce =11 so that we compile against the right JRE -->
+ <version>[11,)</version>
</requireJavaVersion>
</rules>
</configuration>
@@ -100,8 +100,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
<plugin>
Index: src/java-saml-2.4.0/README.md
===================================================================
--- src.orig/java-saml-2.4.0/README.md
+++ src/java-saml-2.4.0/README.md
@@ -110,7 +110,7 @@ also the [Java Cryptography Extension (J
*toolkit:*
* com.onelogin:java-saml-core
-* javax.servlet:servlet-api
+* jakarta.servlet:servlet-api
*maven:*
* org.apache.maven.plugins:maven-jar-plugin
@@ -153,7 +153,7 @@ In the repo, at *src/main/java* you will
#### toolkit (com.onelogin:java-saml) ####
-This folder contains a maven project with the Auth class to handle the low level classes of java-saml-core and the ServletUtils class to handle javax.servlet.http objects, used on the Auth class.
+This folder contains a maven project with the Auth class to handle the low level classes of java-saml-core and the ServletUtils class to handle jakarta.servlet.http objects, used on the Auth class.
In the repo, at *src/main/java* you will find the source and at *src/test/java* the junit tests for the classes Auth and ServletUtils.
#### samples (com.onelogin:java-saml-tookit-samples) ####
@@ -374,9 +374,9 @@ Auth auth = new Auth(settings, request,
#### The HttpRequest
java-saml-core uses HttpRequest class, a framework-agnostic representation of an HTTP request.
-java-saml depends on javax.servlet:servlet-api, and the classes Auth and ServletUtils use HttpServletRequest and HttpServletResponse objects.
+java-saml depends on jakarta.servlet:servlet-api, and the classes Auth and ServletUtils use HttpServletRequest and HttpServletResponse objects.
-If you want to use anything different than javax.servlet.http, you will need to reimplement Auth and ServletUtils based on that new representation of the HTTP request/responses.
+If you want to use anything different than jakarta.servlet.http, you will need to reimplement Auth and ServletUtils based on that new representation of the HTTP request/responses.
#### Initiate SSO
In order to send an AuthNRequest to the IdP:
Index: src/java-saml-2.4.0/toolkit/pom.xml
===================================================================
--- src.orig/java-saml-2.4.0/toolkit/pom.xml
+++ src/java-saml-2.4.0/toolkit/pom.xml
@@ -59,10 +59,9 @@
<!-- httprequest and httpresponse -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>5.0.0</version>
</dependency>
<!-- date and time library for Java -->
Index: src/java-saml-2.4.0/toolkit/src/main/java/com/onelogin/saml2/Auth.java
===================================================================
--- src.orig/java-saml-2.4.0/toolkit/src/main/java/com/onelogin/saml2/Auth.java
+++ src/java-saml-2.4.0/toolkit/src/main/java/com/onelogin/saml2/Auth.java
@@ -12,8 +12,8 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.joda.time.DateTime;
Index: src/java-saml-2.4.0/toolkit/src/main/java/com/onelogin/saml2/servlet/ServletUtils.java
===================================================================
--- src.orig/java-saml-2.4.0/toolkit/src/main/java/com/onelogin/saml2/servlet/ServletUtils.java
+++ src/java-saml-2.4.0/toolkit/src/main/java/com/onelogin/saml2/servlet/ServletUtils.java
@@ -6,8 +6,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
@@ -152,7 +152,7 @@ public class ServletUtils {
* @return string the target URL
* @throws IOException
*
- * @see javax.servlet.http.HttpServletResponse#sendRedirect(String)
+ * @see jakarta.servlet.http.HttpServletResponse#sendRedirect(String)
*/
public static String sendRedirect(HttpServletResponse response, String location, Map<String, String> parameters, Boolean stay) throws IOException {
String target = location;
@@ -192,7 +192,7 @@ public class ServletUtils {
*
* @throws IOException
*
- * @see javax.servlet.http.HttpServletResponse#sendRedirect(String)
+ * @see jakarta.servlet.http.HttpServletResponse#sendRedirect(String)
*/
public static void sendRedirect(HttpServletResponse response, String location, Map<String, String> parameters) throws IOException {
sendRedirect(response, location, parameters, false);
Index: src/java-saml-2.4.0/toolkit/src/test/java/com/onelogin/saml2/test/AuthTest.java
===================================================================
--- src.orig/java-saml-2.4.0/toolkit/src/test/java/com/onelogin/saml2/test/AuthTest.java
+++ src/java-saml-2.4.0/toolkit/src/test/java/com/onelogin/saml2/test/AuthTest.java
@@ -25,9 +25,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
import org.joda.time.Instant;
import org.junit.Rule;
Index: src/java-saml-2.4.0/toolkit/src/test/java/com/onelogin/saml2/test/servlet/ServletUtilsTest.java
===================================================================
--- src.orig/java-saml-2.4.0/toolkit/src/test/java/com/onelogin/saml2/test/servlet/ServletUtilsTest.java
+++ src/java-saml-2.4.0/toolkit/src/test/java/com/onelogin/saml2/test/servlet/ServletUtilsTest.java
@@ -13,8 +13,8 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.junit.Test;
