Skip to content

Commit 6bb5d3e

Browse files
authored
Jakarta servlet version 5 (#639)
1 parent 5d412c0 commit 6bb5d3e

55 files changed

Lines changed: 424 additions & 178 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.

pippo-controller-parent/pippo-controller/pom.xml

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

3434
<!-- Servlet -->
3535
<dependency>
36-
<groupId>javax.servlet</groupId>
37-
<artifactId>javax.servlet-api</artifactId>
36+
<groupId>jakarta.servlet</groupId>
37+
<artifactId>jakarta.servlet-api</artifactId>
3838
<version>${servlet.version}</version>
3939
<scope>provided</scope>
4040
</dependency>

pippo-core/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<dependencies>
1717
<!-- Servlet -->
1818
<dependency>
19-
<groupId>javax.servlet</groupId>
20-
<artifactId>javax.servlet-api</artifactId>
19+
<groupId>jakarta.servlet</groupId>
20+
<artifactId>jakarta.servlet-api</artifactId>
2121
<version>${servlet.version}</version>
2222
<scope>provided</scope>
2323
</dependency>

pippo-core/src/main/java/ro/pippo/core/AbstractWebServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package ro.pippo.core;
1717

18-
import javax.servlet.MultipartConfigElement;
18+
import jakarta.servlet.MultipartConfigElement;
1919
import java.util.EventListener;
2020
import java.util.List;
2121
import java.util.concurrent.CopyOnWriteArrayList;

pippo-core/src/main/java/ro/pippo/core/Application.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import ro.pippo.core.websocket.WebSocketHandler;
3838
import ro.pippo.core.websocket.WebSocketRouter;
3939

40-
import javax.servlet.ServletContext;
40+
import jakarta.servlet.ServletContext;
4141
import java.util.ArrayList;
4242
import java.util.HashMap;
4343
import java.util.List;

pippo-core/src/main/java/ro/pippo/core/FileItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import ro.pippo.core.util.IoUtils;
1919

20-
import javax.servlet.http.Part;
20+
import jakarta.servlet.http.Part;
2121
import java.io.File;
2222
import java.io.IOException;
2323
import java.io.InputStream;

pippo-core/src/main/java/ro/pippo/core/Languages.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import ro.pippo.core.route.RouteContext;
2121
import ro.pippo.core.util.StringUtils;
2222

23-
import javax.servlet.http.Cookie;
23+
import jakarta.servlet.http.Cookie;
2424
import java.util.List;
2525
import java.util.Locale;
2626
import java.util.Map;

pippo-core/src/main/java/ro/pippo/core/PippoFilter.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
import ro.pippo.core.util.PippoUtils;
2222
import ro.pippo.core.util.StringUtils;
2323

24-
import javax.servlet.Filter;
25-
import javax.servlet.FilterChain;
26-
import javax.servlet.FilterConfig;
27-
import javax.servlet.FilterRegistration;
28-
import javax.servlet.ServletContext;
29-
import javax.servlet.ServletException;
30-
import javax.servlet.ServletRequest;
31-
import javax.servlet.ServletResponse;
32-
import javax.servlet.http.HttpServletRequest;
33-
import javax.servlet.http.HttpServletResponse;
24+
import jakarta.servlet.Filter;
25+
import jakarta.servlet.FilterChain;
26+
import jakarta.servlet.FilterConfig;
27+
import jakarta.servlet.FilterRegistration;
28+
import jakarta.servlet.ServletContext;
29+
import jakarta.servlet.ServletException;
30+
import jakarta.servlet.ServletRequest;
31+
import jakarta.servlet.ServletResponse;
32+
import jakarta.servlet.http.HttpServletRequest;
33+
import jakarta.servlet.http.HttpServletResponse;
3434
import java.io.IOException;
3535
import java.net.URI;
3636
import java.util.Collection;

pippo-core/src/main/java/ro/pippo/core/PippoServlet.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
import ro.pippo.core.util.PippoUtils;
2222
import ro.pippo.core.util.StringUtils;
2323

24-
import javax.servlet.ServletConfig;
25-
import javax.servlet.ServletContext;
26-
import javax.servlet.ServletException;
27-
import javax.servlet.ServletRequest;
28-
import javax.servlet.ServletResponse;
29-
import javax.servlet.http.HttpServlet;
30-
import javax.servlet.http.HttpServletRequest;
31-
import javax.servlet.http.HttpServletResponse;
24+
import jakarta.servlet.ServletConfig;
25+
import jakarta.servlet.ServletContext;
26+
import jakarta.servlet.ServletException;
27+
import jakarta.servlet.ServletRequest;
28+
import jakarta.servlet.ServletResponse;
29+
import jakarta.servlet.http.HttpServlet;
30+
import jakarta.servlet.http.HttpServletRequest;
31+
import jakarta.servlet.http.HttpServletResponse;
3232
import java.io.IOException;
3333
import java.net.URI;
3434

pippo-core/src/main/java/ro/pippo/core/PippoServletContextListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import org.slf4j.LoggerFactory;
2020
import ro.pippo.core.util.ServiceLocator;
2121

22-
import javax.servlet.ServletContextEvent;
23-
import javax.servlet.ServletContextListener;
22+
import jakarta.servlet.ServletContextEvent;
23+
import jakarta.servlet.ServletContextListener;
2424
import java.util.List;
2525

2626
/**

pippo-core/src/main/java/ro/pippo/core/Request.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
import ro.pippo.core.util.IoUtils;
2525
import ro.pippo.core.util.StringUtils;
2626

27-
import javax.servlet.http.Cookie;
28-
import javax.servlet.http.HttpServletRequest;
29-
import javax.servlet.http.HttpSession;
30-
import javax.servlet.http.Part;
27+
import jakarta.servlet.http.Cookie;
28+
import jakarta.servlet.http.HttpServletRequest;
29+
import jakarta.servlet.http.HttpSession;
30+
import jakarta.servlet.http.Part;
3131
import java.net.URI;
3232
import java.util.Collection;
3333
import java.util.Collections;

0 commit comments

Comments
 (0)