feat: Upgrade To Tomcat 10 - Meeds-io/MIPs#76

Meeds-io · Aug 29, 2023 · e10f7bb · e10f7bb
1 parent acd7e3b
commit e10f7bb
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/notes-service/src/main/java/org/exoplatform/wiki/filter/WikiToNotesRedirectFilter.java b/notes-service/src/main/java/org/exoplatform/wiki/filter/WikiToNotesRedirectFilter.java
@@ -23,12 +23,12 @@
 import java.util.Arrays;
 import java.util.List;
 
-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 org.exoplatform.container.ExoContainerContext;
 import org.exoplatform.web.filter.Filter;

diff --git a/notes-service/src/main/java/org/exoplatform/wiki/service/impl/SessionCreatedListener.java b/notes-service/src/main/java/org/exoplatform/wiki/service/impl/SessionCreatedListener.java
@@ -16,7 +16,7 @@
  */
 package org.exoplatform.wiki.service.impl;
 
-import javax.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSessionEvent;
 
 import org.exoplatform.container.PortalContainer;
 import org.exoplatform.services.listener.Event;

diff --git a/notes-service/src/main/java/org/exoplatform/wiki/service/impl/SessionDestroyedListener.java b/notes-service/src/main/java/org/exoplatform/wiki/service/impl/SessionDestroyedListener.java
@@ -29,7 +29,7 @@
 import org.exoplatform.wiki.service.NoteService;
 import org.exoplatform.wiki.utils.Utils;
 
-import javax.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSessionEvent;
 
 public class SessionDestroyedListener extends Listener<PortalContainer, HttpSessionEvent> {
 

diff --git a/notes-service/src/main/java/org/exoplatform/wiki/service/rest/NotesRestService.java b/notes-service/src/main/java/org/exoplatform/wiki/service/rest/NotesRestService.java
@@ -23,7 +23,7 @@
 import java.util.stream.Collectors;
 
 import javax.annotation.security.RolesAllowed;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import javax.ws.rs.*;
 import javax.ws.rs.core.*;
 

diff --git a/notes-service/src/main/java/org/exoplatform/wiki/utils/Utils.java b/notes-service/src/main/java/org/exoplatform/wiki/utils/Utils.java
@@ -67,7 +67,7 @@
 
 import javax.mail.internet.AddressException;
 import javax.mail.internet.InternetAddress;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.*;
 import java.util.*;
 import java.util.zip.ZipEntry;

diff --git a/notes-service/src/test/java/org/exoplatform/wiki/service/rest/NotesRestServiceTest.java b/notes-service/src/test/java/org/exoplatform/wiki/service/rest/NotesRestServiceTest.java
@@ -26,7 +26,7 @@
 
 import java.util.*;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.Response;
 
 import org.exoplatform.services.resources.ResourceBundleService;