[JAVA-37381] Update interception-filter, spring-boot-3-url-matching, front-controller and jsf modules to Jakarta namespace (#17127)

GaetanoPiazzolla · web-flow · commit df20d98f7531 · 2024-07-24T07:41:07.000+02:00
diff --git a/patterns-modules/front-controller/pom.xml b/patterns-modules/front-controller/pom.xml
@@ -15,9 +15,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet-api.version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta.servlet-api.version}</version>
         </dependency>
     </dependencies>
 
@@ -44,7 +44,7 @@
     <properties>
         <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
         <jetty-maven-plugin.version>11.0.13</jetty-maven-plugin.version>
-
+        <jakarta.servlet-api.version>5.0.0</jakarta.servlet-api.version>
     </properties>
 
 </project>
diff --git a/patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/FrontControllerServlet.java b/patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/FrontControllerServlet.java
@@ -3,10 +3,10 @@
 import com.baeldung.patterns.front.controller.commands.FrontCommand;
 import com.baeldung.patterns.front.controller.commands.UnknownCommand;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 public class FrontControllerServlet extends HttpServlet {
diff --git a/patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/commands/FrontCommand.java b/patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/commands/FrontCommand.java
@@ -1,10 +1,10 @@
 package com.baeldung.patterns.front.controller.commands;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 public abstract class FrontCommand {
diff --git a/patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/commands/SearchCommand.java b/patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/commands/SearchCommand.java
@@ -3,7 +3,7 @@
 import com.baeldung.patterns.front.controller.data.Book;
 import com.baeldung.patterns.front.controller.data.BookshelfImpl;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 
 public class SearchCommand extends FrontCommand {
diff --git a/patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/commands/UnknownCommand.java b/patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/commands/UnknownCommand.java
@@ -1,6 +1,6 @@
 package com.baeldung.patterns.front.controller.commands;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 
 public class UnknownCommand extends FrontCommand {
diff --git a/patterns-modules/intercepting-filter/pom.xml b/patterns-modules/intercepting-filter/pom.xml
@@ -15,9 +15,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet-api.version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta.servlet-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -50,6 +50,7 @@
     </build>
 
     <properties>
+        <jakarta.servlet-api.version>5.0.0</jakarta.servlet-api.version>
         <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
         <jetty-plugin.version>11.0.20</jetty-plugin.version>
     </properties>
diff --git a/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/FrontControllerServlet.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/FrontControllerServlet.java
@@ -5,12 +5,12 @@
 import com.baeldung.patterns.intercepting.filter.data.Bookshelf;
 import com.baeldung.patterns.intercepting.filter.data.BookshelfImpl;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 @WebServlet(name = "intercepting-filter", urlPatterns = "/")
diff --git a/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/CheckoutCommand.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/CheckoutCommand.java
@@ -2,8 +2,8 @@
 
 import com.baeldung.patterns.intercepting.filter.data.Order;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
 
 public class CheckoutCommand extends FrontCommand {
diff --git a/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/FrontCommand.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/FrontCommand.java
@@ -3,10 +3,10 @@
 import com.baeldung.patterns.intercepting.filter.filters.FilterManager;
 import com.baeldung.patterns.intercepting.filter.filters.OnIntercept;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 public abstract class FrontCommand implements OnIntercept {
diff --git a/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/HomeCommand.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/HomeCommand.java
@@ -2,7 +2,7 @@
 
 import com.baeldung.patterns.intercepting.filter.data.Bookshelf;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 
 public class HomeCommand extends FrontCommand {
diff --git a/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/LoginCommand.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/LoginCommand.java
@@ -1,7 +1,7 @@
 package com.baeldung.patterns.intercepting.filter.commands;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
 import java.util.Optional;
 
diff --git a/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/LogoutCommand.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/LogoutCommand.java
@@ -1,7 +1,7 @@
 package com.baeldung.patterns.intercepting.filter.commands;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
 import java.util.Optional;
 
diff --git a/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/OrderCommand.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/OrderCommand.java
@@ -5,8 +5,8 @@
 import com.baeldung.patterns.intercepting.filter.data.Order;
 import com.baeldung.patterns.intercepting.filter.data.OrderImpl;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
 import java.util.Optional;
 
diff --git a/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/SearchCommand.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/SearchCommand.java
@@ -3,7 +3,7 @@
 import com.baeldung.patterns.intercepting.filter.data.Book;
 import com.baeldung.patterns.intercepting.filter.data.Bookshelf;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.List;
 
diff --git a/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/ShowCommand.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/ShowCommand.java
@@ -3,7 +3,7 @@
 import com.baeldung.patterns.intercepting.filter.data.Book;
 import com.baeldung.patterns.intercepting.filter.data.Bookshelf;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.Collections;
 
diff --git a/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/UnknownCommand.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/UnknownCommand.java
@@ -1,6 +1,6 @@
 package com.baeldung.patterns.intercepting.filter.commands;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 
 public class UnknownCommand extends FrontCommand {
diff --git a/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/AuthenticationFilter.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/AuthenticationFilter.java
@@ -3,10 +3,10 @@
 import com.baeldung.patterns.intercepting.filter.commands.FrontCommand;
 import com.baeldung.patterns.intercepting.filter.commands.LoginCommand;
 
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
 
 public class AuthenticationFilter implements Filter {
diff --git a/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/BaseFilter.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/BaseFilter.java
@@ -3,9 +3,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
 
 public abstract class BaseFilter implements Filter {
     private static final Logger log = LoggerFactory.getLogger(BaseFilter.class);
diff --git a/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/EncodingFilter.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/EncodingFilter.java
@@ -1,8 +1,8 @@
 package com.baeldung.patterns.intercepting.filter.filters;
 
-import javax.servlet.*;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.annotation.WebInitParam;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.annotation.WebInitParam;
 import java.io.IOException;
 import java.util.Optional;
 
diff --git a/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/FilterChainImpl.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/FilterChainImpl.java
@@ -1,6 +1,6 @@
 package com.baeldung.patterns.intercepting.filter.filters;
 
-import javax.servlet.*;
+import jakarta.servlet.*;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Iterator;
diff --git a/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/FilterManager.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/FilterManager.java
@@ -1,9 +1,9 @@
 package com.baeldung.patterns.intercepting.filter.filters;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 public class FilterManager {
diff --git a/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/LoggingFilter.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/LoggingFilter.java
@@ -3,12 +3,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.Optional;
 
diff --git a/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/TemplateFilter.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/TemplateFilter.java
@@ -1,11 +1,11 @@
 package com.baeldung.patterns.intercepting.filter.filters;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 public abstract class TemplateFilter extends BaseFilter {
diff --git a/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/VisitorCounterFilter.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/VisitorCounterFilter.java
@@ -1,8 +1,8 @@
 package com.baeldung.patterns.intercepting.filter.filters;
 
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Optional;
diff --git a/spring-boot-modules/spring-boot-3-url-matching/pom.xml b/spring-boot-modules/spring-boot-3-url-matching/pom.xml
@@ -47,12 +47,6 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet-api.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
@@ -92,7 +86,6 @@
     </build>
 
     <properties>
-        <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
         <reactor-core.version>3.6.0</reactor-core.version>
         <reactor-test.version>3.6.0></reactor-test.version>
         <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
diff --git a/web-modules/jsf/pom.xml b/web-modules/jsf/pom.xml
diff --git a/web-modules/jsf/src/main/java/com/baeldung/springintegration/config/MainWebAppInitializer.java b/web-modules/jsf/src/main/java/com/baeldung/springintegration/config/MainWebAppInitializer.java
diff --git a/web-modules/jsf/src/main/java/com/baeldung/springintegration/config/SpringCoreConfig.java b/web-modules/jsf/src/main/java/com/baeldung/springintegration/config/SpringCoreConfig.java
diff --git a/web-modules/jsf/src/main/java/com/baeldung/springintegration/controllers/ELSampleBean.java b/web-modules/jsf/src/main/java/com/baeldung/springintegration/controllers/ELSampleBean.java
diff --git a/web-modules/jsf/src/main/java/com/baeldung/springintegration/controllers/HelloPFBean.java b/web-modules/jsf/src/main/java/com/baeldung/springintegration/controllers/HelloPFBean.java
diff --git a/web-modules/jsf/src/main/java/com/baeldung/springintegration/controllers/HelloPFMBean.java b/web-modules/jsf/src/main/java/com/baeldung/springintegration/controllers/HelloPFMBean.java
diff --git a/web-modules/jsf/src/main/java/com/baeldung/springintegration/controllers/RegistrationBean.java b/web-modules/jsf/src/main/java/com/baeldung/springintegration/controllers/RegistrationBean.java
diff --git a/web-modules/jsf/src/main/java/com/baeldung/springintegration/dao/UserManagementDAOImpl.java b/web-modules/jsf/src/main/java/com/baeldung/springintegration/dao/UserManagementDAOImpl.java
