Skip to content

Commit 5d36f82

Browse files
rjunqueirarjunqueira
committed
fix build to use jakarta.servlet instead of javax.servlet
1 parent 3ad6fbc commit 5d36f82

76 files changed

Lines changed: 314 additions & 294 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pom.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.owasp.esapi</groupId>
55
<artifactId>esapi</artifactId>
6-
<version>2.5.3.0-SNAPSHOT</version>
6+
<version>2.5.3.0-SNAPSHOT-JAKARTA</version>
77
<packaging>jar</packaging>
88

99
<distributionManagement>
@@ -152,24 +152,24 @@
152152

153153
<dependencies>
154154
<dependency>
155-
<groupId>javax.servlet</groupId>
156-
<artifactId>javax.servlet-api</artifactId>
157-
<version>3.1.0</version>
155+
<groupId>jakarta.servlet</groupId>
156+
<artifactId>jakarta.servlet-api</artifactId>
157+
<version>6.0.0</version>
158158
<scope>provided</scope>
159159
</dependency>
160160
<dependency>
161-
<groupId>javax.servlet.jsp</groupId>
162-
<artifactId>javax.servlet.jsp-api</artifactId>
163-
<version>2.3.3</version>
161+
<groupId>jakarta.servlet.jsp</groupId>
162+
<artifactId>jakarta.servlet.jsp-api</artifactId>
163+
<version>3.1.1</version>
164164
<scope>provided</scope>
165165
<!-- Note: Because this dependency is provided, this exclusion doesn't actually do anything.
166166
But we include it so the convergence report will report 100% convergence.
167167
Deleting this does not cause the convergence check to fail.
168168
-->
169169
<exclusions>
170170
<exclusion>
171-
<groupId>javax.servlet</groupId>
172-
<artifactId>javax.servlet-api</artifactId>
171+
<groupId>jakarta.servlet</groupId>
172+
<artifactId>jakarta.servlet-api</artifactId>
173173
</exclusion>
174174
</exclusions>
175175
</dependency>
@@ -229,9 +229,9 @@
229229
<version>2.6</version>
230230
</dependency>
231231
<dependency>
232-
<groupId>commons-fileupload</groupId>
233-
<artifactId>commons-fileupload</artifactId>
234-
<version>1.5</version>
232+
<groupId>org.apache.commons</groupId>
233+
<artifactId>commons-fileupload2</artifactId>
234+
<version>2.0-SNAPSHOT</version>
235235
</dependency>
236236
<dependency>
237237
<groupId>org.apache.commons</groupId>

‎src/examples/java/PersistedEncryptedData.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.owasp.esapi.crypto.*;
44
import org.owasp.esapi.errors.*;
55
import org.owasp.esapi.codecs.*;
6-
import javax.servlet.ServletRequest;
6+
import jakarta.servlet.ServletRequest;
77

88
/** A slightly more complex example showing encoding encrypted data and writing
99
* it out to a file. This is very similar to the example in the ESAPI User

‎src/main/java/org/owasp/esapi/Authenticator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import org.owasp.esapi.errors.AuthenticationException;
1919
import org.owasp.esapi.errors.EncryptionException;
2020

21-
import javax.servlet.http.HttpServletRequest;
22-
import javax.servlet.http.HttpServletResponse;
21+
import jakarta.servlet.http.HttpServletRequest;
22+
import jakarta.servlet.http.HttpServletResponse;
2323
import java.util.Set;
2424

2525

‎src/main/java/org/owasp/esapi/ESAPI.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
package org.owasp.esapi;
1818

19-
import javax.servlet.http.HttpServletRequest;
20-
import javax.servlet.http.HttpServletResponse;
19+
import jakarta.servlet.http.HttpServletRequest;
20+
import jakarta.servlet.http.HttpServletResponse;
2121

2222
import org.owasp.esapi.util.ObjFactory;
2323

‎src/main/java/org/owasp/esapi/HTTPUtilities.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717

1818
import org.owasp.esapi.errors.*;
1919

20-
import javax.servlet.ServletException;
21-
import javax.servlet.http.Cookie;
22-
import javax.servlet.http.HttpServletRequest;
23-
import javax.servlet.http.HttpServletResponse;
24-
import javax.servlet.http.HttpSession;
20+
import jakarta.servlet.ServletException;
21+
import jakarta.servlet.http.Cookie;
22+
import jakarta.servlet.http.HttpServletRequest;
23+
import jakarta.servlet.http.HttpServletResponse;
24+
import jakarta.servlet.http.HttpSession;
2525
import java.io.File;
2626
import java.io.IOException;
2727
import java.util.List;

‎src/main/java/org/owasp/esapi/User.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.owasp.esapi.errors.AuthenticationHostException;
2020
import org.owasp.esapi.errors.EncryptionException;
2121

22-
import javax.servlet.http.HttpSession;
22+
import jakarta.servlet.http.HttpSession;
2323
import java.io.Serializable;
2424
import java.security.Principal;
2525
import java.util.*;

‎src/main/java/org/owasp/esapi/Validator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.List;
2424
import java.util.Set;
2525

26-
import javax.servlet.http.HttpServletRequest;
26+
import jakarta.servlet.http.HttpServletRequest;
2727

2828
import org.owasp.esapi.errors.IntrusionException;
2929
import org.owasp.esapi.errors.ValidationException;

‎src/main/java/org/owasp/esapi/filters/ClickjackFilter.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
package org.owasp.esapi.filters;
1818
import java.io.IOException;
1919

20-
import javax.servlet.Filter;
21-
import javax.servlet.FilterChain;
22-
import javax.servlet.FilterConfig;
23-
import javax.servlet.ServletException;
24-
import javax.servlet.ServletRequest;
25-
import javax.servlet.ServletResponse;
26-
import javax.servlet.http.HttpServletResponse;
20+
import jakarta.servlet.Filter;
21+
import jakarta.servlet.FilterChain;
22+
import jakarta.servlet.FilterConfig;
23+
import jakarta.servlet.ServletException;
24+
import jakarta.servlet.ServletRequest;
25+
import jakarta.servlet.ServletResponse;
26+
import jakarta.servlet.http.HttpServletResponse;
2727

2828
/**
2929
* The {@code ClickjackFilter} is configured as follows:

‎src/main/java/org/owasp/esapi/filters/ESAPIFilter.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
import java.io.IOException;
1919
import java.util.Arrays;
2020

21-
import javax.servlet.Filter;
22-
import javax.servlet.FilterChain;
23-
import javax.servlet.FilterConfig;
24-
import javax.servlet.RequestDispatcher;
25-
import javax.servlet.ServletRequest;
26-
import javax.servlet.ServletResponse;
27-
import javax.servlet.http.HttpServletRequest;
28-
import javax.servlet.http.HttpServletResponse;
21+
import jakarta.servlet.Filter;
22+
import jakarta.servlet.FilterChain;
23+
import jakarta.servlet.FilterConfig;
24+
import jakarta.servlet.RequestDispatcher;
25+
import jakarta.servlet.ServletRequest;
26+
import jakarta.servlet.ServletResponse;
27+
import jakarta.servlet.http.HttpServletRequest;
28+
import jakarta.servlet.http.HttpServletResponse;
2929

3030
import org.owasp.esapi.ESAPI;
3131
import org.owasp.esapi.Logger;

‎src/main/java/org/owasp/esapi/filters/RequestRateThrottleFilter.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@
1717

1818
import org.owasp.esapi.ESAPI;
1919

20-
import javax.servlet.*;
21-
import javax.servlet.http.HttpServletRequest;
22-
import javax.servlet.http.HttpSession;
20+
import jakarta.servlet.*;
21+
import jakarta.servlet.http.HttpServletRequest;
22+
import jakarta.servlet.http.HttpSession;
2323
import java.io.IOException;
24-
import java.util.Date;
2524
import java.util.List;
2625
import java.util.LinkedList;
2726

0 commit comments

Comments
 (0)