Skip to content

Commit e4cc584

Browse files
timis1timis1
authored
[JAVA-37368] Upgrade web-modules/javax-servlets-2 to jakarta namespace (#17085)
1 parent 2e9a6ba commit e4cc584

30 files changed

+143
-126
lines changed

web-modules/javax-servlets-2/README.md renamed to web-modules/jakarta-servlets-2/README.md

File renamed without changes.

web-modules/javax-servlets-2/pom.xml renamed to web-modules/jakarta-servlets-2/pom.xml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.baeldung.javax-servlets</groupId>
7-
<artifactId>javax-servlets-2</artifactId>
7+
<artifactId>jakarta-servlets-2</artifactId>
88
<version>1.0-SNAPSHOT</version>
99
<packaging>war</packaging>
10-
<name>javax-servlets-2</name>
10+
<name>jakarta-servlets-2</name>
1111

1212
<parent>
1313
<groupId>com.baeldung</groupId>
@@ -29,20 +29,20 @@
2929
</dependency>
3030
<!-- Servlet -->
3131
<dependency>
32-
<groupId>javax.servlet</groupId>
33-
<artifactId>javax.servlet-api</artifactId>
34-
<version>${javax.servlet-api.version}</version>
32+
<groupId>jakarta.servlet</groupId>
33+
<artifactId>jakarta.servlet-api</artifactId>
34+
<version>${jakarta.servlet-api.version}</version>
3535
</dependency>
3636
<dependency>
37-
<groupId>javax.servlet.jsp</groupId>
38-
<artifactId>javax.servlet.jsp-api</artifactId>
39-
<version>${javax.servlet.jsp-api.version}</version>
37+
<groupId>jakarta.servlet.jsp</groupId>
38+
<artifactId>jakarta.servlet.jsp-api</artifactId>
39+
<version>${jakarta.servlet.jsp-api.version}</version>
4040
<scope>provided</scope>
4141
</dependency>
4242
<dependency>
43-
<groupId>javax.servlet</groupId>
44-
<artifactId>jstl</artifactId>
45-
<version>${jstl.version}</version>
43+
<groupId>jakarta.servlet.jsp.jstl</groupId>
44+
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
45+
<version>${jakarta.servlet.jsp.jstl-api.version}</version>
4646
</dependency>
4747
<dependency>
4848
<groupId>org.jmockit</groupId>
@@ -108,11 +108,14 @@
108108
<properties>
109109
<httpclient.version>4.5.13</httpclient.version>
110110
<jmockit.version>1.49</jmockit.version>
111-
<spring-test.version>5.3.20</spring-test.version>
111+
<spring-test.version>6.1.10</spring-test.version>
112112
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
113113
<jetty-maven-plugin.version>10.0.4</jetty-maven-plugin.version>
114114
<commons-text.version>1.10.0</commons-text.version>
115115
<uap.version>1.5.4</uap.version>
116+
<jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>
117+
<jakarta.servlet.jsp-api.version>4.0.0</jakarta.servlet.jsp-api.version>
118+
<jakarta.servlet.jsp.jstl-api.version>3.0.0</jakarta.servlet.jsp.jstl-api.version>
116119
</properties>
117120

118121
</project>

web-modules/javax-servlets-2/src/main/java/com/baeldung/servlets/AccountServlet.java renamed to web-modules/jakarta-servlets-2/src/main/java/com/baeldung/servlets/AccountServlet.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
import java.io.IOException;
44
import java.util.Map;
55

6-
import javax.servlet.annotation.WebServlet;
7-
import javax.servlet.http.*;
6+
import jakarta.servlet.annotation.WebServlet;
7+
import jakarta.servlet.http.HttpServlet;
8+
import jakarta.servlet.http.HttpServletRequest;
9+
import jakarta.servlet.http.HttpServletResponse;
810

911
import org.slf4j.Logger;
1012
import org.slf4j.LoggerFactory;

web-modules/javax-servlets-2/src/main/java/com/baeldung/servlets/UserServlet.java renamed to web-modules/jakarta-servlets-2/src/main/java/com/baeldung/servlets/UserServlet.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import java.io.IOException;
44

5-
import javax.servlet.annotation.WebServlet;
6-
import javax.servlet.http.HttpServlet;
7-
import javax.servlet.http.HttpServletRequest;
8-
import javax.servlet.http.HttpServletResponse;
5+
import jakarta.servlet.annotation.WebServlet;
6+
import jakarta.servlet.http.HttpServlet;
7+
import jakarta.servlet.http.HttpServletRequest;
8+
import jakarta.servlet.http.HttpServletResponse;
99

1010
@WebServlet(name = "UserServlet", urlPatterns = "/user")
1111
public class UserServlet extends HttpServlet {

web-modules/javax-servlets-2/src/main/java/com/baeldung/servlets/clientinfo/AccountLogic.java renamed to web-modules/jakarta-servlets-2/src/main/java/com/baeldung/servlets/clientinfo/AccountLogic.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
import java.util.HashMap;
44
import java.util.Map;
55

6-
import javax.servlet.http.HttpServletRequest;
7-
6+
import jakarta.servlet.http.HttpServletRequest;
87
import ua_parser.Client;
98
import ua_parser.Parser;
109

web-modules/javax-servlets-2/src/main/java/com/baeldung/setparam/LanguageServlet.java renamed to web-modules/jakarta-servlets-2/src/main/java/com/baeldung/setparam/LanguageServlet.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
import java.io.IOException;
44
import java.util.Locale;
55

6-
import javax.servlet.ServletException;
7-
import javax.servlet.annotation.WebServlet;
8-
import javax.servlet.http.*;
6+
import jakarta.servlet.ServletException;
7+
import jakarta.servlet.annotation.WebServlet;
8+
import jakarta.servlet.http.HttpServlet;
9+
import jakarta.servlet.http.HttpServletRequest;
10+
import jakarta.servlet.http.HttpServletResponse;
911

1012
@WebServlet(name = "LanguageServlet", urlPatterns = "/setparam/lang")
1113
public class LanguageServlet extends HttpServlet {

web-modules/javax-servlets-2/src/main/java/com/baeldung/setparam/SanitizeParametersFilter.java renamed to web-modules/jakarta-servlets-2/src/main/java/com/baeldung/setparam/SanitizeParametersFilter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.baeldung.setparam;
22

33
import java.io.IOException;
4-
import javax.servlet.*;
5-
import javax.servlet.annotation.WebFilter;
6-
import javax.servlet.http.HttpServletRequest;
4+
import jakarta.servlet.*;
5+
import jakarta.servlet.annotation.WebFilter;
6+
import jakarta.servlet.http.HttpServletRequest;
77

88
@WebFilter(urlPatterns = { "/setparam/with-sanitize.jsp" })
99
public class SanitizeParametersFilter implements Filter {

web-modules/javax-servlets-2/src/main/java/com/baeldung/setparam/SanitizeParametersRequestWrapper.java renamed to web-modules/jakarta-servlets-2/src/main/java/com/baeldung/setparam/SanitizeParametersRequestWrapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import java.util.*;
44
import java.util.stream.Collectors;
55

6-
import javax.servlet.http.HttpServletRequest;
7-
import javax.servlet.http.HttpServletRequestWrapper;
6+
import jakarta.servlet.http.HttpServletRequest;
7+
import jakarta.servlet.http.HttpServletRequestWrapper;
88

99
import org.apache.commons.text.StringEscapeUtils;
1010

web-modules/javax-servlets-2/src/main/java/com/baeldung/setparam/SetParameterRequestWrapper.java renamed to web-modules/jakarta-servlets-2/src/main/java/com/baeldung/setparam/SetParameterRequestWrapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import java.util.*;
44

5-
import javax.servlet.http.HttpServletRequest;
6-
import javax.servlet.http.HttpServletRequestWrapper;
5+
import jakarta.servlet.http.HttpServletRequest;
6+
import jakarta.servlet.http.HttpServletRequestWrapper;
77

88
public class SetParameterRequestWrapper extends HttpServletRequestWrapper {
99

web-modules/javax-servlets-2/src/main/java/com/baeldung/user/check/User.java renamed to web-modules/jakarta-servlets-2/src/main/java/com/baeldung/user/check/User.java

File renamed without changes.

0 commit comments

Comments
 (0)