Skip to content

Commit 433e922

Browse files
timis1timis1
authored
[JAVA-37370] Upgrade web-modules/javax-servlets to jakarta namespace (#17089)
1 parent 3198502 commit 433e922

Some content is hidden

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

43 files changed

+109
-119
lines changed

web-modules/javax-servlets/.gitignore renamed to web-modules/jakarta-servlets/.gitignore

File renamed without changes.

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

File renamed without changes.

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>
6-
<groupId>com.baeldung.javax-servlets</groupId>
7-
<artifactId>javax-servlets</artifactId>
6+
<groupId>com.baeldung.jakarta-servlets</groupId>
7+
<artifactId>jakarta-servlets</artifactId>
88
<version>1.0-SNAPSHOT</version>
99
<packaging>war</packaging>
10-
<name>javax-servlets</name>
10+
<name>jakarta-servlets</name>
1111

1212
<parent>
1313
<groupId>com.baeldung</groupId>
@@ -18,15 +18,15 @@
1818
<dependencies>
1919
<!-- File Uploading -->
2020
<dependency>
21-
<groupId>commons-fileupload</groupId>
22-
<artifactId>commons-fileupload</artifactId>
23-
<version>${commons-fileupload.version}</version>
21+
<groupId>org.apache.commons</groupId>
22+
<artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
23+
<version>2.0.0-M2</version>
2424
</dependency>
2525
<!-- Servlet -->
2626
<dependency>
27-
<groupId>javax.servlet</groupId>
28-
<artifactId>javax.servlet-api</artifactId>
29-
<version>${javax.servlet-api.version}</version>
27+
<groupId>jakarta.servlet</groupId>
28+
<artifactId>jakarta.servlet-api</artifactId>
29+
<version>${jakarta.servlet-api.version}</version>
3030
</dependency>
3131
<dependency>
3232
<groupId>org.apache.httpcomponents</groupId>
@@ -50,6 +50,8 @@
5050
<properties>
5151
<httpclient.version>4.5.3</httpclient.version>
5252
<gson.version>2.11.0</gson.version>
53+
<jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>
54+
<java.version>17</java.version>
5355
</properties>
5456

5557
</project>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ public class Constants {
55
public static final String UPLOAD_DIRECTORY = "upload";
66
public static final String DEFAULT_FILENAME = "default.file";
77

8-
public static final int MEMORY_THRESHOLD = 1024 * 1024 * 3;
98
public static final int MAX_FILE_SIZE = 1024 * 1024 * 40;
109
public static final int MAX_REQUEST_SIZE = 1024 * 1024 * 50;
1110
}

web-modules/javax-servlets/src/main/java/com/baeldung/controller/StudentServlet.java renamed to web-modules/jakarta-servlets/src/main/java/com/baeldung/controller/StudentServlet.java

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

33
import com.baeldung.service.StudentService;
44

5-
import javax.servlet.RequestDispatcher;
6-
import javax.servlet.ServletException;
7-
import javax.servlet.annotation.WebServlet;
8-
import javax.servlet.http.HttpServlet;
9-
import javax.servlet.http.HttpServletRequest;
10-
import javax.servlet.http.HttpServletResponse;
5+
import jakarta.servlet.RequestDispatcher;
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;
1111
import java.io.IOException;
1212

1313
@WebServlet(name = "StudentServlet", urlPatterns = "/student-record")

web-modules/javax-servlets/src/main/java/com/baeldung/model/Employee.java renamed to web-modules/jakarta-servlets/src/main/java/com/baeldung/model/Employee.java

File renamed without changes.

web-modules/javax-servlets/src/main/java/com/baeldung/model/Student.java renamed to web-modules/jakarta-servlets/src/main/java/com/baeldung/model/Student.java

File renamed without changes.

web-modules/javax-servlets/src/main/java/com/baeldung/service/StudentService.java renamed to web-modules/jakarta-servlets/src/main/java/com/baeldung/service/StudentService.java

File renamed without changes.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.baeldung.servlets;
22

3-
import javax.servlet.http.Cookie;
4-
import javax.servlet.http.HttpServletRequest;
3+
import jakarta.servlet.http.Cookie;
4+
import jakarta.servlet.http.HttpServletRequest;
55
import java.util.Arrays;
66
import java.util.Optional;
77

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import java.io.InputStream;
55
import java.io.OutputStream;
66

7-
import javax.servlet.annotation.WebServlet;
8-
import javax.servlet.http.HttpServlet;
9-
import javax.servlet.http.HttpServletRequest;
10-
import javax.servlet.http.HttpServletResponse;
7+
import jakarta.servlet.annotation.WebServlet;
8+
import jakarta.servlet.http.HttpServlet;
9+
import jakarta.servlet.http.HttpServletRequest;
10+
import jakarta.servlet.http.HttpServletResponse;
1111

1212
@WebServlet("/download")
1313
public class DownloadServlet extends HttpServlet {

0 commit comments

Comments
 (0)