diff --git a/jspwiki-210-adapters/pom.xml b/jspwiki-210-adapters/pom.xml index 27ea83f2e..dc5017b9c 100644 --- a/jspwiki-210-adapters/pom.xml +++ b/jspwiki-210-adapters/pom.xml @@ -45,8 +45,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided diff --git a/jspwiki-api/pom.xml b/jspwiki-api/pom.xml index 99f245aa6..6b06bb774 100644 --- a/jspwiki-api/pom.xml +++ b/jspwiki-api/pom.xml @@ -58,14 +58,14 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided - javax.servlet.jsp - javax.servlet.jsp-api + jakarta.servlet.jsp + jakarta.servlet.jsp-api provided diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/core/Context.java b/jspwiki-api/src/main/java/org/apache/wiki/api/core/Context.java index 6bd09012f..9b6b2b1ec 100644 --- a/jspwiki-api/src/main/java/org/apache/wiki/api/core/Context.java +++ b/jspwiki-api/src/main/java/org/apache/wiki/api/core/Context.java @@ -18,8 +18,8 @@ */ package org.apache.wiki.api.core; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.jsp.PageContext; import java.security.Principal; diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/core/Engine.java b/jspwiki-api/src/main/java/org/apache/wiki/api/core/Engine.java index 07e4fb4cf..0e90cf90b 100644 --- a/jspwiki-api/src/main/java/org/apache/wiki/api/core/Engine.java +++ b/jspwiki-api/src/main/java/org/apache/wiki/api/core/Engine.java @@ -25,7 +25,7 @@ import org.apache.wiki.api.exceptions.WikiException; import org.apache.wiki.event.WikiEventListener; import org.apache.wiki.util.TextUtil; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/ContextDSL.java b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/ContextDSL.java index 909bfaeda..af13ab2e8 100644 --- a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/ContextDSL.java +++ b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/ContextDSL.java @@ -23,7 +23,7 @@ import org.apache.wiki.api.core.Context; import org.apache.wiki.api.core.Engine; import org.apache.wiki.api.core.Page; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public class ContextDSL { diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/ContextSPI.java b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/ContextSPI.java index b9916a7ce..3200e5895 100644 --- a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/ContextSPI.java +++ b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/ContextSPI.java @@ -23,7 +23,7 @@ import org.apache.wiki.api.core.Context; import org.apache.wiki.api.core.Engine; import org.apache.wiki.api.core.Page; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/EngineDSL.java b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/EngineDSL.java index da5586be3..89c5d20b8 100644 --- a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/EngineDSL.java +++ b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/EngineDSL.java @@ -20,8 +20,8 @@ package org.apache.wiki.api.spi; import org.apache.wiki.api.core.Engine; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; import java.util.Properties; diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/EngineSPI.java b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/EngineSPI.java index 90c9da202..54f8b771c 100644 --- a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/EngineSPI.java +++ b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/EngineSPI.java @@ -20,7 +20,7 @@ package org.apache.wiki.api.spi; import org.apache.wiki.api.core.Engine; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.util.Properties; diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/SessionDSL.java b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/SessionDSL.java index fe57ce032..5f6401e52 100644 --- a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/SessionDSL.java +++ b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/SessionDSL.java @@ -21,7 +21,7 @@ package org.apache.wiki.api.spi; import org.apache.wiki.api.core.Engine; import org.apache.wiki.api.core.Session; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/SessionSPI.java b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/SessionSPI.java index f0c5f1574..8c95d25ad 100644 --- a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/SessionSPI.java +++ b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/SessionSPI.java @@ -21,7 +21,7 @@ package org.apache.wiki.api.spi; import org.apache.wiki.api.core.Engine; import org.apache.wiki.api.core.Session; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/Wiki.java b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/Wiki.java index 93e03cceb..567488a6d 100644 --- a/jspwiki-api/src/main/java/org/apache/wiki/api/spi/Wiki.java +++ b/jspwiki-api/src/main/java/org/apache/wiki/api/spi/Wiki.java @@ -21,7 +21,7 @@ package org.apache.wiki.api.spi; import org.apache.wiki.util.PropertyReader; import org.apache.wiki.util.TextUtil; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.nio.file.ProviderNotFoundException; import java.util.Properties; import java.util.ServiceLoader; diff --git a/jspwiki-api/src/test/java/org/apache/wiki/api/spi/ContextSPITestImpl.java b/jspwiki-api/src/test/java/org/apache/wiki/api/spi/ContextSPITestImpl.java index 38e924507..4779b69cb 100644 --- a/jspwiki-api/src/test/java/org/apache/wiki/api/spi/ContextSPITestImpl.java +++ b/jspwiki-api/src/test/java/org/apache/wiki/api/spi/ContextSPITestImpl.java @@ -23,7 +23,7 @@ import org.apache.wiki.api.core.Context; import org.apache.wiki.api.core.Engine; import org.apache.wiki.api.core.Page; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public class ContextSPITestImpl implements ContextSPI { diff --git a/jspwiki-api/src/test/java/org/apache/wiki/api/spi/EngineSPITestImpl.java b/jspwiki-api/src/test/java/org/apache/wiki/api/spi/EngineSPITestImpl.java index c7c30cd7d..22bf1c547 100644 --- a/jspwiki-api/src/test/java/org/apache/wiki/api/spi/EngineSPITestImpl.java +++ b/jspwiki-api/src/test/java/org/apache/wiki/api/spi/EngineSPITestImpl.java @@ -20,7 +20,7 @@ package org.apache.wiki.api.spi; import org.apache.wiki.api.core.Engine; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.util.Properties; diff --git a/jspwiki-api/src/test/java/org/apache/wiki/api/spi/SessionSPITestImpl.java b/jspwiki-api/src/test/java/org/apache/wiki/api/spi/SessionSPITestImpl.java index 15517cede..b361f6c19 100644 --- a/jspwiki-api/src/test/java/org/apache/wiki/api/spi/SessionSPITestImpl.java +++ b/jspwiki-api/src/test/java/org/apache/wiki/api/spi/SessionSPITestImpl.java @@ -21,7 +21,7 @@ package org.apache.wiki.api.spi; import org.apache.wiki.api.core.Engine; import org.apache.wiki.api.core.Session; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public class SessionSPITestImpl implements SessionSPI { diff --git a/jspwiki-api/src/test/java/org/apache/wiki/api/spi/WikiTest.java b/jspwiki-api/src/test/java/org/apache/wiki/api/spi/WikiTest.java index 1edbbba43..dd9ac7050 100644 --- a/jspwiki-api/src/test/java/org/apache/wiki/api/spi/WikiTest.java +++ b/jspwiki-api/src/test/java/org/apache/wiki/api/spi/WikiTest.java @@ -25,8 +25,8 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; import java.util.Properties; diff --git a/jspwiki-bootstrap/pom.xml b/jspwiki-bootstrap/pom.xml index 7c4fefe20..2589fac56 100644 --- a/jspwiki-bootstrap/pom.xml +++ b/jspwiki-bootstrap/pom.xml @@ -43,14 +43,14 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided - javax.servlet.jsp - javax.servlet.jsp-api + jakarta.servlet.jsp + jakarta.servlet.jsp-api provided diff --git a/jspwiki-bootstrap/src/main/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListener.java b/jspwiki-bootstrap/src/main/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListener.java index 6ce842848..b967617bd 100644 --- a/jspwiki-bootstrap/src/main/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListener.java +++ b/jspwiki-bootstrap/src/main/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListener.java @@ -27,8 +27,8 @@ import org.apache.logging.log4j.core.config.properties.PropertiesConfigurationFa import org.apache.wiki.api.spi.Wiki; import org.apache.wiki.util.TextUtil; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListenerTest.java b/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListenerTest.java index bdc6cc017..c65973aef 100644 --- a/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListenerTest.java +++ b/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListenerTest.java @@ -24,8 +24,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; import java.util.Properties; diff --git a/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/ContextSPITestImpl.java b/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/ContextSPITestImpl.java index ea19f1340..9a8cbac74 100644 --- a/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/ContextSPITestImpl.java +++ b/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/ContextSPITestImpl.java @@ -24,7 +24,7 @@ import org.apache.wiki.api.core.Engine; import org.apache.wiki.api.core.Page; import org.apache.wiki.api.spi.ContextSPI; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public class ContextSPITestImpl implements ContextSPI { diff --git a/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/EngineSPITestImpl.java b/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/EngineSPITestImpl.java index 6e3b49a06..3deec067b 100644 --- a/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/EngineSPITestImpl.java +++ b/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/EngineSPITestImpl.java @@ -21,7 +21,7 @@ package org.apache.wiki.bootstrap.spi; import org.apache.wiki.api.core.Engine; import org.apache.wiki.api.spi.EngineSPI; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.util.Properties; diff --git a/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/SessionSPITestImpl.java b/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/SessionSPITestImpl.java index 9b26d16a1..183d667fe 100644 --- a/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/SessionSPITestImpl.java +++ b/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/spi/SessionSPITestImpl.java @@ -22,7 +22,7 @@ import org.apache.wiki.api.core.Engine; import org.apache.wiki.api.core.Session; import org.apache.wiki.api.spi.SessionSPI; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public class SessionSPITestImpl implements SessionSPI { diff --git a/jspwiki-http/pom.xml b/jspwiki-http/pom.xml index 6096f2cca..3d49a6a8d 100644 --- a/jspwiki-http/pom.xml +++ b/jspwiki-http/pom.xml @@ -53,8 +53,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided diff --git a/jspwiki-http/src/main/java/org/apache/wiki/http/filter/CsrfProtectionFilter.java b/jspwiki-http/src/main/java/org/apache/wiki/http/filter/CsrfProtectionFilter.java index 808c3517c..365f229f3 100644 --- a/jspwiki-http/src/main/java/org/apache/wiki/http/filter/CsrfProtectionFilter.java +++ b/jspwiki-http/src/main/java/org/apache/wiki/http/filter/CsrfProtectionFilter.java @@ -6,14 +6,14 @@ import org.apache.wiki.api.core.Engine; import org.apache.wiki.api.core.Session; import org.apache.wiki.api.spi.Wiki; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -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.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +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; diff --git a/jspwiki-kendra-searchprovider/pom.xml b/jspwiki-kendra-searchprovider/pom.xml index d720c22b3..eadec8d0f 100644 --- a/jspwiki-kendra-searchprovider/pom.xml +++ b/jspwiki-kendra-searchprovider/pom.xml @@ -88,8 +88,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api test diff --git a/jspwiki-main/pom.xml b/jspwiki-main/pom.xml index 2f0c4fc6d..31ae6aa87 100644 --- a/jspwiki-main/pom.xml +++ b/jspwiki-main/pom.xml @@ -29,6 +29,14 @@ jspwiki-main Apache JSPWiki Main Jar + + + apache-commons-snapshots + apache-commons-snapshots + https://repository.apache.org/content/repositories/snapshots/ + + + ${project.groupId} @@ -72,8 +80,8 @@ - commons-fileupload - commons-fileupload + org.apache.commons + commons-fileupload2 @@ -92,13 +100,13 @@ - javax.servlet - jstl + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api - javax.mail - mail + com.sun.mail + jakarta.mail @@ -182,14 +190,14 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided - javax.servlet.jsp - javax.servlet.jsp-api + jakarta.servlet.jsp + jakarta.servlet.jsp-api provided diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiContext.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiContext.java index 640b9ae90..ffa4868fb 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/WikiContext.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiContext.java @@ -40,9 +40,9 @@ import org.apache.wiki.ui.PageCommand; import org.apache.wiki.ui.WikiCommand; import org.apache.wiki.util.TextUtil; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.jsp.PageContext; import java.security.Permission; import java.security.Principal; import java.util.HashMap; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java index c1d12121a..184c9df76 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java @@ -61,8 +61,8 @@ import org.apache.wiki.util.TextUtil; import org.apache.wiki.variables.VariableManager; import org.apache.wiki.workflow.WorkflowManager; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; import java.io.File; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiServlet.java index 5834bd2a7..2cd1f63dc 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/WikiServlet.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiServlet.java @@ -25,12 +25,12 @@ import org.apache.wiki.api.engine.EngineLifecycleExtension; import org.apache.wiki.api.spi.Wiki; import org.apache.wiki.url.URLConstructor; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; @@ -61,7 +61,7 @@ public class WikiServlet extends HttpServlet { * protected method {@link WikiEngine#stop()}, which sends {@link org.apache.wiki.event.WikiEngineEvent#SHUTDOWN} * events to registered listeners, as well as notifying available {@link EngineLifecycleExtension EngineLifecycleExtension}s. * - * @see javax.servlet.GenericServlet#destroy() + * @see jakarta.servlet.GenericServlet#destroy() */ @Override public void destroy() { diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java index 318b2156b..7c13537e8 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java @@ -39,8 +39,8 @@ import org.apache.wiki.event.WikiSecurityEvent; import org.apache.wiki.util.HttpUtil; import javax.security.auth.Subject; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import java.security.Principal; import java.util.ArrayList; import java.util.Arrays; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ajax/AjaxUtil.java b/jspwiki-main/src/main/java/org/apache/wiki/ajax/AjaxUtil.java index 164492f0b..3b48d96c9 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ajax/AjaxUtil.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ajax/AjaxUtil.java @@ -21,8 +21,8 @@ package org.apache.wiki.ajax; import com.google.gson.Gson; import org.apache.commons.lang3.StringUtils; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; /** * Helpful utilities for the Ajax functions. diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java index 24edcb02a..cc1d4fb56 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java @@ -28,11 +28,11 @@ import org.apache.wiki.auth.AuthorizationManager; import org.apache.wiki.auth.permissions.PagePermission; import org.apache.wiki.util.TextUtil; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -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.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.security.Permission; import java.util.ArrayList; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxServlet.java index 366a3e06b..44e49845b 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxServlet.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxServlet.java @@ -21,9 +21,9 @@ package org.apache.wiki.ajax; import org.apache.wiki.plugin.SampleAjaxPlugin; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java index 6b0d01db1..92179c538 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java @@ -18,12 +18,12 @@ */ package org.apache.wiki.attachment; -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileItemFactory; -import org.apache.commons.fileupload.FileUploadException; -import org.apache.commons.fileupload.ProgressListener; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.apache.commons.fileupload.servlet.ServletFileUpload; +import org.apache.commons.fileupload2.FileItem; +import org.apache.commons.fileupload2.FileItemFactory; +import org.apache.commons.fileupload2.FileUploadException; +import org.apache.commons.fileupload2.ProgressListener; +import org.apache.commons.fileupload2.disk.DiskFileItemFactory; +import org.apache.commons.fileupload2.servlet.ServletFileUpload; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.wiki.api.core.Attachment; @@ -46,12 +46,12 @@ import org.apache.wiki.ui.progress.ProgressManager; import org.apache.wiki.util.HttpUtil; import org.apache.wiki.util.TextUtil; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -63,6 +63,7 @@ import java.security.Principal; import java.util.ArrayList; import java.util.List; import java.util.Properties; +import org.apache.commons.fileupload2.jaksrvlt.JakSrvltFileUpload; /** @@ -378,7 +379,7 @@ public class AttachmentServlet extends HttpServlet { final String progressId = req.getParameter( "progressid" ); // Check that we have a file upload request - if( !ServletFileUpload.isMultipartContent(req) ) { + if( !JakSrvltFileUpload.isMultipartContent(req) ) { throw new RedirectException( "Not a file upload", errorPage ); } @@ -391,7 +392,7 @@ public class AttachmentServlet extends HttpServlet { m_engine.getManager( ProgressManager.class ).startProgress( pl, progressId ); - final ServletFileUpload upload = new ServletFileUpload( factory ); + final JakSrvltFileUpload upload = new JakSrvltFileUpload( factory ); upload.setHeaderEncoding( StandardCharsets.UTF_8.name() ); if( !context.hasAdminPermissions() ) { upload.setFileSizeMax( m_maxSize ); @@ -454,12 +455,12 @@ public class AttachmentServlet extends HttpServlet { LOG.warn( msg + " (attachment: " + attName + ")", e ); throw e; - } catch( final FileUploadException e ) { - // Show the submit page again, but with a bit more intimidating output. - msg = "Upload failure: " + e.getMessage(); - LOG.warn( msg + " (attachment: " + attName + ")", e ); - - throw new IOException( msg, e ); +// } catch( final FileUploadException e ) { +// // Show the submit page again, but with a bit more intimidating output. +// msg = "Upload failure: " + e.getMessage(); +// LOG.warn( msg + " (attachment: " + attName + ")", e ); +// +// throw new IOException( msg, e ); } finally { m_engine.getManager( ProgressManager.class ).stopProgress( progressId ); // FIXME: In case of exceptions should absolutely remove the uploaded file. diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthenticationManager.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthenticationManager.java index 72a93f92a..7cfae6670 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthenticationManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthenticationManager.java @@ -28,7 +28,7 @@ import org.apache.wiki.event.WikiSecurityEvent; import javax.security.auth.Subject; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.spi.LoginModule; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.security.Principal; import java.util.Map; import java.util.Set; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthorizationManager.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthorizationManager.java index 74e11de2a..28d2dab91 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthorizationManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthorizationManager.java @@ -26,7 +26,7 @@ import org.apache.wiki.event.WikiEventListener; import org.apache.wiki.event.WikiEventManager; import org.apache.wiki.event.WikiSecurityEvent; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.security.AccessController; import java.security.Permission; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/Authorizer.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/Authorizer.java index 84468d7b6..a5d8c8957 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/Authorizer.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/Authorizer.java @@ -32,7 +32,7 @@ import java.util.Properties; * injected, the Authorizer is queried for the roles it knows about by calling {@link org.apache.wiki.auth.Authorizer#getRoles()}. Then, * each role returned by the Authorizer is tested by calling {@link org.apache.wiki.auth.Authorizer#isUserInRole(Session, Principal)}. * If this check fails, and the Authorizer is of type WebAuthorizer, AuthenticationManager checks the role again by calling - * {@link org.apache.wiki.auth.authorize.WebAuthorizer#isUserInRole(javax.servlet.http.HttpServletRequest, Principal)}). + * {@link org.apache.wiki.auth.authorize.WebAuthorizer#isUserInRole(jakarta.servlet.http.HttpServletRequest, Principal)}). * Any roles that pass the test are injected into the Subject by firing appropriate authentication events. * * @since 2.3 diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthenticationManager.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthenticationManager.java index aad865ee6..0b83006d9 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthenticationManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthenticationManager.java @@ -44,8 +44,8 @@ import javax.security.auth.Subject; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.LoginException; import javax.security.auth.spi.LoginModule; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import java.security.Principal; import java.util.Collections; import java.util.HashMap; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthorizationManager.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthorizationManager.java index 09b0bc296..1a4250f23 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthorizationManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthorizationManager.java @@ -46,7 +46,7 @@ import org.apache.wiki.preferences.Preferences; import org.apache.wiki.util.ClassUtil; import org.freshcookies.security.policy.LocalPolicy; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.net.URL; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultUserManager.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultUserManager.java index 7e86180c8..02032002a 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultUserManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultUserManager.java @@ -56,9 +56,9 @@ import org.apache.wiki.workflow.Workflow; import org.apache.wiki.workflow.WorkflowBuilder; import org.apache.wiki.workflow.WorkflowManager; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.security.Permission; import java.security.Principal; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/SessionMonitor.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/SessionMonitor.java index ddd8dd81e..d36e8dffa 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/SessionMonitor.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/SessionMonitor.java @@ -28,10 +28,10 @@ import org.apache.wiki.event.WikiEventManager; import org.apache.wiki.event.WikiSecurityEvent; import org.apache.wiki.util.comparators.PrincipalComparator; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; import java.security.Principal; import java.util.ArrayList; import java.util.Arrays; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java index e2816eb1d..58a0f672d 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java @@ -28,7 +28,7 @@ import org.apache.wiki.event.WikiEventListener; import org.apache.wiki.event.WikiEventManager; import org.apache.wiki.event.WikiSecurityEvent; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java index ea9ec291a..572b84e81 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java @@ -20,19 +20,19 @@ package org.apache.wiki.auth.authorize; import org.apache.wiki.auth.Authorizer; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.security.Principal; /** * Extends the {@link org.apache.wiki.auth.Authorizer} interface by including a delegate method for - * {@link javax.servlet.http.HttpServletRequest#isUserInRole(String)}. + * {@link jakarta.servlet.http.HttpServletRequest#isUserInRole(String)}. */ public interface WebAuthorizer extends Authorizer { /** * Determines whether a user associated with an HTTP request possesses a particular role. This method simply delegates to - * {@link javax.servlet.http.HttpServletRequest#isUserInRole(String)} by converting the Principal's name to a String. + * {@link jakarta.servlet.http.HttpServletRequest#isUserInRole(String)} by converting the Principal's name to a String. * * @param request the HTTP request * @param role the role to check diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java index 7018c67f7..4ca7e5bbc 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java @@ -35,7 +35,7 @@ import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.net.URL; import java.security.Principal; @@ -130,7 +130,7 @@ public class WebContainerAuthorizer implements WebAuthorizer { /** * Determines whether a user associated with an HTTP request possesses * a particular role. This method simply delegates to - * {@link javax.servlet.http.HttpServletRequest#isUserInRole(String)} + * {@link jakarta.servlet.http.HttpServletRequest#isUserInRole(String)} * by converting the Principal's name to a String. * @param request the HTTP request * @param role the role to check @@ -149,7 +149,7 @@ public class WebContainerAuthorizer implements WebAuthorizer { * return false. * This method simply examines the Session subject to see if it * possesses the desired Principal. We assume that the method - * {@link org.apache.wiki.ui.WikiServletFilter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)} + * {@link org.apache.wiki.ui.WikiServletFilter#doFilter(jakarta.servlet.ServletRequest, jakarta.servlet.ServletResponse, jakarta.servlet.FilterChain)} * previously executed, and that it has set the Session * subject correctly by logging in the user with the various login modules, * in particular {@link org.apache.wiki.auth.login.WebContainerLoginModule}}. diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/AnonymousLoginModule.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/AnonymousLoginModule.java index 6da91a51f..f10c76d6f 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/AnonymousLoginModule.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/AnonymousLoginModule.java @@ -26,8 +26,8 @@ import org.apache.wiki.util.HttpUtil; import javax.security.auth.callback.Callback; import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.auth.login.LoginException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import java.io.IOException; /** diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAssertionLoginModule.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAssertionLoginModule.java index ac626b1e7..62d961897 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAssertionLoginModule.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAssertionLoginModule.java @@ -28,10 +28,10 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.auth.login.FailedLoginException; import javax.security.auth.login.LoginException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.IOException; /** diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.java index 1d98e66cb..ceffa060f 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.java @@ -29,9 +29,9 @@ import org.apache.wiki.util.TextUtil; import javax.security.auth.callback.Callback; import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.auth.login.LoginException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/HttpRequestCallback.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/HttpRequestCallback.java index f98482ceb..87c4655e6 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/HttpRequestCallback.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/HttpRequestCallback.java @@ -19,14 +19,14 @@ package org.apache.wiki.auth.login; import javax.security.auth.callback.Callback; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Callback for requesting and supplying a HttpServletRequest required by a * LoginModule. This Callback is used by LoginModules needing access to the * servlet request. - * @see javax.servlet.http.HttpServletRequest#getUserPrincipal() or - * @see javax.servlet.http.HttpServletRequest#getRemoteUser() methods. + * @see jakarta.servlet.http.HttpServletRequest#getUserPrincipal() or + * @see jakarta.servlet.http.HttpServletRequest#getRemoteUser() methods. * @since 2.3 */ public class HttpRequestCallback implements Callback diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java index 85e7f8a5d..31087b7e3 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java @@ -23,7 +23,7 @@ import org.apache.wiki.api.core.Engine; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerLoginModule.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerLoginModule.java index 68f3c8dd1..d0a77da2e 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerLoginModule.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerLoginModule.java @@ -26,8 +26,8 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.auth.login.FailedLoginException; import javax.security.auth.login.LoginException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import java.io.IOException; import java.security.Principal; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WikiCallbackHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WikiCallbackHandler.java index f7a89156e..bb4968620 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WikiCallbackHandler.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WikiCallbackHandler.java @@ -26,7 +26,7 @@ import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.NameCallback; import javax.security.auth.callback.PasswordCallback; import javax.security.auth.callback.UnsupportedCallbackException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/DefaultUserProfile.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/DefaultUserProfile.java index a7d2e0ef1..3589c3144 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/DefaultUserProfile.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/DefaultUserProfile.java @@ -20,7 +20,7 @@ package org.apache.wiki.auth.user; import org.apache.commons.lang3.StringUtils; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.Serializable; import java.util.Date; import java.util.HashMap; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/UserProfile.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/UserProfile.java index ec8afa447..374646b09 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/UserProfile.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/UserProfile.java @@ -161,7 +161,7 @@ public interface UserProfile extends Serializable /** * Sets the name by which the user logs in. The login name is used as the * username for custom authentication (see - * {@link org.apache.wiki.auth.AuthenticationManager#login(org.apache.wiki.api.core.Session, javax.servlet.http.HttpServletRequest, String, String)}, + * {@link org.apache.wiki.auth.AuthenticationManager#login(org.apache.wiki.api.core.Session, jakarta.servlet.http.HttpServletRequest, String, String)}, * {@link org.apache.wiki.auth.login.UserDatabaseLoginModule}). The login * name is typically a short name ("jannej"). In contrast, the wiki name is * typically of type FirstnameLastName ("JanneJalkanen"). diff --git a/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java index c12940119..4ab8c9ca4 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java @@ -56,9 +56,9 @@ import org.suigeneris.jrcs.diff.delta.DeleteDelta; import org.suigeneris.jrcs.diff.delta.Delta; import org.suigeneris.jrcs.diff.myers.MyersDiff; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.PageContext; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java index 675f20df0..8e082d440 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java @@ -49,7 +49,7 @@ import org.apache.wiki.util.XhtmlUtil; import org.apache.wiki.util.XmlUtil; import org.jdom2.Element; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServlet; import java.io.IOException; import java.io.PrintWriter; import java.io.StreamTokenizer; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/Denounce.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Denounce.java index 7e84792f2..d7c7f6808 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/Denounce.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Denounce.java @@ -33,7 +33,7 @@ import org.apache.wiki.api.exceptions.PluginException; import org.apache.wiki.api.plugin.Plugin; import org.apache.wiki.util.TextUtil; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.io.InputStream; import java.net.URL; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/SampleAjaxPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/SampleAjaxPlugin.java index f9349ad77..e80093963 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/SampleAjaxPlugin.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/SampleAjaxPlugin.java @@ -23,9 +23,9 @@ import org.apache.wiki.api.core.Context; import org.apache.wiki.api.exceptions.PluginException; import org.apache.wiki.api.plugin.Plugin; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java b/jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java index 1f3347f9b..df4e0c36f 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java @@ -30,8 +30,8 @@ import org.apache.wiki.util.HttpUtil; import org.apache.wiki.util.PropertyReader; import org.apache.wiki.util.TextUtil; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.jsp.PageContext; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java index 949c2b125..6e98dca0d 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java @@ -40,11 +40,11 @@ import org.intabulas.sandler.elements.Person; import org.intabulas.sandler.elements.impl.LinkImpl; import org.intabulas.sandler.exceptions.FeedMarshallException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -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.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Collection; import java.util.Date; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/rss/AtomFeed.java b/jspwiki-main/src/main/java/org/apache/wiki/rss/AtomFeed.java index c5fe0dc27..c22e584c0 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/rss/AtomFeed.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/rss/AtomFeed.java @@ -32,7 +32,7 @@ import org.jdom2.Namespace; import org.jdom2.output.Format; import org.jdom2.output.XMLOutputter; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.IOException; import java.io.StringWriter; import java.util.ArrayList; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/rss/Feed.java b/jspwiki-main/src/main/java/org/apache/wiki/rss/Feed.java index 3842cab53..5e937c682 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/rss/Feed.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/rss/Feed.java @@ -24,7 +24,7 @@ import org.apache.wiki.api.core.Engine; import org.apache.wiki.api.exceptions.NoSuchVariableException; import org.apache.wiki.variables.VariableManager; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.util.ArrayList; import java.util.List; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/rss/RSS20Feed.java b/jspwiki-main/src/main/java/org/apache/wiki/rss/RSS20Feed.java index f4798018e..4816eb1d8 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/rss/RSS20Feed.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/rss/RSS20Feed.java @@ -31,7 +31,7 @@ import org.jdom2.Element; import org.jdom2.output.Format; import org.jdom2.output.XMLOutputter; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.IOException; import java.io.StringWriter; import java.text.SimpleDateFormat; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java b/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java index c5da24ece..962823940 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java @@ -43,8 +43,8 @@ import org.apache.wiki.references.ReferenceManager; import org.apache.wiki.util.ClassUtil; import org.apache.wiki.util.TextUtil; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/spi/ContextSPIDefaultImpl.java b/jspwiki-main/src/main/java/org/apache/wiki/spi/ContextSPIDefaultImpl.java index fd05b935d..bf2b1d452 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/spi/ContextSPIDefaultImpl.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/spi/ContextSPIDefaultImpl.java @@ -25,7 +25,7 @@ import org.apache.wiki.api.core.Engine; import org.apache.wiki.api.core.Page; import org.apache.wiki.api.spi.ContextSPI; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** diff --git a/jspwiki-main/src/main/java/org/apache/wiki/spi/EngineSPIDefaultImpl.java b/jspwiki-main/src/main/java/org/apache/wiki/spi/EngineSPIDefaultImpl.java index 7ecac1de8..fe4ed7650 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/spi/EngineSPIDefaultImpl.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/spi/EngineSPIDefaultImpl.java @@ -22,7 +22,7 @@ import org.apache.wiki.WikiEngine; import org.apache.wiki.api.core.Engine; import org.apache.wiki.api.spi.EngineSPI; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.util.Properties; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/spi/SessionSPIDefaultImpl.java b/jspwiki-main/src/main/java/org/apache/wiki/spi/SessionSPIDefaultImpl.java index b05f03725..c431adc4a 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/spi/SessionSPIDefaultImpl.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/spi/SessionSPIDefaultImpl.java @@ -23,7 +23,7 @@ import org.apache.wiki.api.core.Engine; import org.apache.wiki.api.core.Session; import org.apache.wiki.api.spi.SessionSPI; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/AdminBeanIteratorInfo.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/AdminBeanIteratorInfo.java index ecd349017..a744fc772 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/AdminBeanIteratorInfo.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/AdminBeanIteratorInfo.java @@ -18,9 +18,9 @@ */ package org.apache.wiki.tags; -import javax.servlet.jsp.tagext.TagData; -import javax.servlet.jsp.tagext.TagExtraInfo; -import javax.servlet.jsp.tagext.VariableInfo; +import jakarta.servlet.jsp.tagext.TagData; +import jakarta.servlet.jsp.tagext.TagExtraInfo; +import jakarta.servlet.jsp.tagext.VariableInfo; /** * Just provides iteration support for AdminBeanIteratorTag diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorInfo.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorInfo.java index c7b5110ce..cd7cc5d98 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorInfo.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorInfo.java @@ -18,9 +18,9 @@ */ package org.apache.wiki.tags; -import javax.servlet.jsp.tagext.TagData; -import javax.servlet.jsp.tagext.TagExtraInfo; -import javax.servlet.jsp.tagext.VariableInfo; +import jakarta.servlet.jsp.tagext.TagData; +import jakarta.servlet.jsp.tagext.TagExtraInfo; +import jakarta.servlet.jsp.tagext.VariableInfo; /** * Just provides the TEI data for AttachmentsIteratorTag. diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorTag.java index d95e83acf..ece36d3db 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorTag.java @@ -28,8 +28,8 @@ import org.apache.wiki.api.exceptions.ProviderException; import org.apache.wiki.attachment.AttachmentManager; import org.apache.wiki.pages.PageManager; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.PageContext; import java.io.IOException; import java.util.List; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/BreadcrumbsTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/BreadcrumbsTag.java index bca0fb416..60af85583 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/BreadcrumbsTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/BreadcrumbsTag.java @@ -24,8 +24,8 @@ import org.apache.wiki.api.core.ContextEnum; import org.apache.wiki.pages.PageManager; import org.apache.wiki.util.TextUtil; -import javax.servlet.http.HttpSession; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; import java.io.Serializable; import java.util.LinkedList; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java index 51cda55db..ad93187e4 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java @@ -27,8 +27,8 @@ import org.apache.wiki.pages.PageManager; import org.apache.wiki.util.HttpUtil; import org.apache.wiki.util.TextUtil; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockInfo.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockInfo.java index a3d00ce4f..3e62d67f2 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockInfo.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockInfo.java @@ -18,9 +18,9 @@ */ package org.apache.wiki.tags; -import javax.servlet.jsp.tagext.TagData; -import javax.servlet.jsp.tagext.TagExtraInfo; -import javax.servlet.jsp.tagext.VariableInfo; +import jakarta.servlet.jsp.tagext.TagData; +import jakarta.servlet.jsp.tagext.TagExtraInfo; +import jakarta.servlet.jsp.tagext.VariableInfo; /** * A companion to CheckLogTag. diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockTag.java index 537049487..1c4aaccaa 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockTag.java @@ -24,7 +24,7 @@ import org.apache.wiki.api.exceptions.ProviderException; import org.apache.wiki.pages.PageLock; import org.apache.wiki.pages.PageManager; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import java.io.IOException; /** diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CommentLinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CommentLinkTag.java index 826a18025..5788bdc72 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CommentLinkTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CommentLinkTag.java @@ -22,7 +22,7 @@ import org.apache.wiki.InternalWikiException; import org.apache.wiki.api.core.ContextEnum; import org.apache.wiki.api.core.Page; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/ContentTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/ContentTag.java index 5cb551913..f4d18c683 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/ContentTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/ContentTag.java @@ -24,8 +24,8 @@ import org.apache.wiki.api.core.ContextEnum; import org.apache.wiki.api.exceptions.ProviderException; import org.apache.wiki.ui.TemplateManager; -import javax.servlet.ServletException; -import javax.servlet.jsp.JspException; +import jakarta.servlet.ServletException; +import jakarta.servlet.jsp.JspException; import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java index d41c3e647..412bbcdf0 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java @@ -27,11 +27,11 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.tagext.TagSupport; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/DiffLinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/DiffLinkTag.java index 01fce48c9..83ab21f1b 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/DiffLinkTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/DiffLinkTag.java @@ -24,7 +24,7 @@ import org.apache.wiki.api.core.Page; import org.apache.wiki.api.providers.WikiProvider; import org.apache.wiki.pages.PageManager; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; /** diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/EditLinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditLinkTag.java index e20e2900a..e06f40bf6 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/EditLinkTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditLinkTag.java @@ -23,7 +23,7 @@ import org.apache.wiki.api.core.Engine; import org.apache.wiki.api.core.Page; import org.apache.wiki.pages.PageManager; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; /** diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorInfo.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorInfo.java index 1da79cad2..d9dbb8ae5 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorInfo.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorInfo.java @@ -18,9 +18,9 @@ */ package org.apache.wiki.tags; -import javax.servlet.jsp.tagext.TagExtraInfo; -import javax.servlet.jsp.tagext.TagData; -import javax.servlet.jsp.tagext.VariableInfo; +import jakarta.servlet.jsp.tagext.TagExtraInfo; +import jakarta.servlet.jsp.tagext.TagData; +import jakarta.servlet.jsp.tagext.VariableInfo; /** * Just provides the TEI data for EditorIteratorTag. diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorTag.java index b97a3798d..17e2590ad 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorTag.java @@ -24,8 +24,8 @@ import org.apache.wiki.api.core.Engine; import org.apache.wiki.ui.EditorManager; import org.apache.wiki.ui.TemplateManager; -import javax.servlet.ServletException; -import javax.servlet.jsp.JspException; +import jakarta.servlet.ServletException; +import jakarta.servlet.jsp.JspException; import java.io.IOException; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorInfo.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorInfo.java index 374902736..f2c72c037 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorInfo.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorInfo.java @@ -18,9 +18,9 @@ */ package org.apache.wiki.tags; -import javax.servlet.jsp.tagext.TagData; -import javax.servlet.jsp.tagext.TagExtraInfo; -import javax.servlet.jsp.tagext.VariableInfo; +import jakarta.servlet.jsp.tagext.TagData; +import jakarta.servlet.jsp.tagext.TagExtraInfo; +import jakarta.servlet.jsp.tagext.VariableInfo; /** * Just provides the TEI data for HistoryIteratorTag. diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorTag.java index f5194137f..429e98bb3 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorTag.java @@ -26,8 +26,8 @@ import org.apache.wiki.api.core.Page; import org.apache.wiki.api.exceptions.ProviderException; import org.apache.wiki.pages.PageManager; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.PageContext; import java.io.IOException; import java.util.List; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/IfNoSearchResultsTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/IfNoSearchResultsTag.java index 1215fb5a2..fd2908500 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/IfNoSearchResultsTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/IfNoSearchResultsTag.java @@ -20,7 +20,7 @@ package org.apache.wiki.tags; import java.io.IOException; import java.util.Collection; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.jsp.PageContext; /** diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/IncludeTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/IncludeTag.java index bff6d9466..ec6c617c2 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/IncludeTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/IncludeTag.java @@ -24,8 +24,8 @@ import org.apache.wiki.api.exceptions.ProviderException; import org.apache.wiki.ui.TemplateManager; import org.apache.wiki.util.TextUtil; -import javax.servlet.ServletException; -import javax.servlet.jsp.JspException; +import jakarta.servlet.ServletException; +import jakarta.servlet.jsp.JspException; import java.io.IOException; /** diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertDiffTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertDiffTag.java index 3d64093b7..5b2c10761 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertDiffTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertDiffTag.java @@ -25,8 +25,8 @@ import org.apache.wiki.api.core.Engine; import org.apache.wiki.diff.DifferenceManager; import org.apache.wiki.pages.PageManager; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.PageContext; import java.io.IOException; /** diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertPageTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertPageTag.java index f86f028ee..141b54e70 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertPageTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertPageTag.java @@ -26,7 +26,7 @@ import org.apache.wiki.api.exceptions.ProviderException; import org.apache.wiki.pages.PageManager; import org.apache.wiki.render.RenderingManager; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; /** diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/IteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/IteratorTag.java index 9f91c19a0..cfbbd9129 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/IteratorTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/IteratorTag.java @@ -23,10 +23,10 @@ import org.apache.logging.log4j.Logger; import org.apache.wiki.api.core.Context; import org.apache.wiki.api.core.Page; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.BodyTagSupport; -import javax.servlet.jsp.tagext.TryCatchFinally; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.tagext.BodyTagSupport; +import jakarta.servlet.jsp.tagext.TryCatchFinally; import java.io.IOException; import java.util.Arrays; import java.util.Collection; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java index afdfa7b40..f287b68c1 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java @@ -32,9 +32,9 @@ import org.apache.wiki.parser.LinkParsingOperations; import org.apache.wiki.parser.MarkupParser; import org.apache.wiki.util.TextUtil; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.tagext.BodyContent; -import javax.servlet.jsp.tagext.BodyTag; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.BodyContent; +import jakarta.servlet.jsp.tagext.BodyTag; import java.util.HashMap; import java.util.Iterator; import java.util.Map; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkToTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkToTag.java index 1ea602c09..dae8a0ed8 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkToTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkToTag.java @@ -23,7 +23,7 @@ import org.apache.wiki.api.core.ContextEnum; import org.apache.wiki.api.core.Page; import org.apache.wiki.attachment.AttachmentManager; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/PageInfoLinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageInfoLinkTag.java index 1e64efd5c..5292468e1 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/PageInfoLinkTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageInfoLinkTag.java @@ -23,7 +23,7 @@ import org.apache.wiki.api.core.Engine; import org.apache.wiki.api.core.Page; import org.apache.wiki.pages.PageManager; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; /** diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/ParamTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/ParamTag.java index 9592532f8..406a76dc0 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/ParamTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/ParamTag.java @@ -18,9 +18,9 @@ */ package org.apache.wiki.tags; -import javax.servlet.jsp.tagext.BodyContent; -import javax.servlet.jsp.tagext.BodyTagSupport; -import javax.servlet.jsp.tagext.Tag; +import jakarta.servlet.jsp.tagext.BodyContent; +import jakarta.servlet.jsp.tagext.BodyTagSupport; +import jakarta.servlet.jsp.tagext.Tag; /** * ParamTag submits name-value pairs to the first enclosing diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/PluginTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/PluginTag.java index e1acc7919..faae992e4 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/PluginTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/PluginTag.java @@ -24,8 +24,8 @@ import org.apache.wiki.api.core.Engine; import org.apache.wiki.api.exceptions.PluginException; import org.apache.wiki.plugin.PluginManager; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.BodyContent; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.BodyContent; import java.io.IOException; import java.util.Map; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/RSSImageLinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/RSSImageLinkTag.java index 2db5f9319..297ff72cc 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/RSSImageLinkTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/RSSImageLinkTag.java @@ -24,7 +24,7 @@ import org.apache.wiki.i18n.InternationalizationManager; import org.apache.wiki.preferences.Preferences; import org.apache.wiki.rss.RSSGenerator; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; import java.text.MessageFormat; import java.util.ResourceBundle; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorInfo.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorInfo.java index 4ee2e3f27..654d07430 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorInfo.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorInfo.java @@ -18,9 +18,9 @@ */ package org.apache.wiki.tags; -import javax.servlet.jsp.tagext.TagData; -import javax.servlet.jsp.tagext.TagExtraInfo; -import javax.servlet.jsp.tagext.VariableInfo; +import jakarta.servlet.jsp.tagext.TagData; +import jakarta.servlet.jsp.tagext.TagExtraInfo; +import jakarta.servlet.jsp.tagext.VariableInfo; /** diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorTag.java index cb5ee1f5f..9f643f4ef 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorTag.java @@ -27,9 +27,9 @@ import org.apache.wiki.api.search.SearchResult; import org.apache.wiki.api.spi.Wiki; import org.apache.wiki.ui.PageCommand; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.PageContext; import java.io.IOException; import java.util.Collection; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsSizeTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsSizeTag.java index a7095f80d..9b026fb58 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsSizeTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsSizeTag.java @@ -20,7 +20,7 @@ package org.apache.wiki.tags; import java.io.IOException; import java.util.Collection; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.jsp.PageContext; /** * Outputs the size of the search results list, if it contains any items. diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsTag.java index 96ac7ef7b..1c86cc032 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsTag.java @@ -20,7 +20,7 @@ package org.apache.wiki.tags; import java.io.IOException; import java.util.Collection; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.jsp.PageContext; /** diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/SetPaginationTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/SetPaginationTag.java index 6b3e105ea..3d503aaae 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/SetPaginationTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/SetPaginationTag.java @@ -20,7 +20,7 @@ package org.apache.wiki.tags; import java.io.IOException; -import javax.servlet.jsp.jstl.fmt.LocaleSupport; +import jakarta.servlet.jsp.jstl.fmt.LocaleSupport; import org.apache.wiki.util.TextUtil; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/SpamFilterInputsTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/SpamFilterInputsTag.java index 0219d4988..456610ad9 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/SpamFilterInputsTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/SpamFilterInputsTag.java @@ -22,8 +22,8 @@ package org.apache.wiki.tags; import org.apache.wiki.filters.SpamFilter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.jsp.PageContext; /** * Provides hidden input fields which are checked by the {@code SpamFilter}. diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/TabTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/TabTag.java index e93760e8a..d64569da1 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/TabTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/TabTag.java @@ -21,7 +21,7 @@ package org.apache.wiki.tags; import java.io.IOException; -import javax.servlet.jsp.JspTagException; +import jakarta.servlet.jsp.JspTagException; import org.apache.wiki.util.TextUtil; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/TabbedSectionTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/TabbedSectionTag.java index 078d28df3..a47a22515 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/TabbedSectionTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/TabbedSectionTag.java @@ -18,8 +18,8 @@ */ package org.apache.wiki.tags; -import javax.servlet.jsp.*; -import javax.servlet.jsp.tagext.*; +import jakarta.servlet.jsp.*; +import jakarta.servlet.jsp.tagext.*; /** * Generates tabbed page section: container for the Tab tag. diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/TranslateTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/TranslateTag.java index 05795f58d..9c31617ca 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/TranslateTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/TranslateTag.java @@ -23,10 +23,10 @@ import org.apache.logging.log4j.Logger; import org.apache.wiki.api.core.Context; import org.apache.wiki.render.RenderingManager; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.BodyContent; -import javax.servlet.jsp.tagext.BodyTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.tagext.BodyContent; +import jakarta.servlet.jsp.tagext.BodyTagSupport; /** * Converts the body text into HTML content. diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/UploadLinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/UploadLinkTag.java index cd5b01ab6..4a23811ed 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/UploadLinkTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/UploadLinkTag.java @@ -20,7 +20,7 @@ package org.apache.wiki.tags; import org.apache.wiki.api.core.ContextEnum; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/UserNameTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/UserNameTag.java index 88227f239..f878e283b 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/UserNameTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/UserNameTag.java @@ -25,7 +25,7 @@ import org.apache.wiki.i18n.InternationalizationManager; import org.apache.wiki.preferences.Preferences; import org.apache.wiki.util.TextUtil; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.security.Principal; import java.util.regex.Pattern; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/UserProfileTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/UserProfileTag.java index 01c0f6b12..5afcb0170 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/UserProfileTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/UserProfileTag.java @@ -31,7 +31,7 @@ import org.apache.wiki.i18n.InternationalizationManager; import org.apache.wiki.preferences.Preferences; import org.apache.wiki.util.TextUtil; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.security.Principal; import java.util.ArrayList; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/VariableTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/VariableTag.java index 4f746523d..b53a29fc2 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/VariableTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/VariableTag.java @@ -23,8 +23,8 @@ import org.apache.wiki.api.exceptions.NoSuchVariableException; import org.apache.wiki.util.TextUtil; import org.apache.wiki.variables.VariableManager; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; /** diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiBodyTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiBodyTag.java index 39bafbd24..dc7ed2381 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiBodyTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiBodyTag.java @@ -23,10 +23,10 @@ import org.apache.logging.log4j.Logger; import org.apache.wiki.WikiContext; import org.apache.wiki.api.core.Context; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.BodyTagSupport; -import javax.servlet.jsp.tagext.TryCatchFinally; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.tagext.BodyTagSupport; +import jakarta.servlet.jsp.tagext.TryCatchFinally; import java.io.IOException; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiTagBase.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiTagBase.java index 8eeb701f4..a7b92ca40 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiTagBase.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiTagBase.java @@ -23,10 +23,10 @@ import org.apache.logging.log4j.Logger; import org.apache.wiki.api.core.Context; import org.apache.wiki.util.TextUtil; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.TagSupport; -import javax.servlet.jsp.tagext.TryCatchFinally; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.tagext.TryCatchFinally; /** diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tasks/auth/SaveUserProfileTask.java b/jspwiki-main/src/main/java/org/apache/wiki/tasks/auth/SaveUserProfileTask.java index aab23c8a0..a6dcfdd31 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tasks/auth/SaveUserProfileTask.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tasks/auth/SaveUserProfileTask.java @@ -14,8 +14,8 @@ import org.apache.wiki.workflow.Outcome; import org.apache.wiki.workflow.Task; import org.apache.wiki.workflow.WorkflowManager; -import javax.mail.MessagingException; -import javax.mail.internet.AddressException; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.AddressException; import java.util.Locale; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/CommandResolver.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/CommandResolver.java index 1a161b101..5fce3eefc 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/CommandResolver.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/CommandResolver.java @@ -22,7 +22,7 @@ import org.apache.wiki.api.core.Command; import org.apache.wiki.api.core.Page; import org.apache.wiki.api.exceptions.ProviderException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java index 71dda837e..342c1f3f7 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java @@ -33,7 +33,7 @@ import org.apache.wiki.parser.MarkupParser; import org.apache.wiki.url.URLConstructor; import org.apache.wiki.util.TextUtil; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultTemplateManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultTemplateManager.java index 48d6e65eb..24de99e9e 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultTemplateManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultTemplateManager.java @@ -29,9 +29,9 @@ import org.apache.wiki.modules.WikiModuleInfo; import org.apache.wiki.preferences.Preferences; import org.apache.wiki.preferences.Preferences.TimeFormat; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.jsp.PageContext; import java.io.IOException; import java.io.InputStream; import java.text.SimpleDateFormat; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java index 3c1236aa3..befae7168 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java @@ -22,7 +22,7 @@ import org.apache.wiki.api.core.Context; import org.apache.wiki.api.engine.Initializable; import org.apache.wiki.modules.ModuleManager; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.jsp.PageContext; /** diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java index 50b5900de..9c563b97f 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java @@ -35,8 +35,8 @@ import org.apache.wiki.pages.PageManager; import org.apache.wiki.providers.FileSystemProvider; import org.apache.wiki.util.TextUtil; -import javax.servlet.ServletConfig; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.http.HttpServletRequest; import java.io.File; import java.io.IOException; import java.io.OutputStream; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/TemplateManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/TemplateManager.java index b1fa47c74..a0f3c08e6 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/TemplateManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/TemplateManager.java @@ -26,8 +26,8 @@ import org.apache.wiki.modules.ModuleManager; import org.apache.wiki.preferences.Preferences; import org.apache.wiki.util.ClassUtil; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.jstl.fmt.LocaleSupport; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.jstl.fmt.LocaleSupport; import java.util.Enumeration; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java index 9f961efea..7fcb5ebbb 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java @@ -30,16 +30,16 @@ import org.apache.wiki.event.WikiPageEvent; import org.apache.wiki.url.URLConstructor; import org.apache.wiki.util.TextUtil; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.WriteListener; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.WriteListener; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiRequestWrapper.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiRequestWrapper.java index 64104ec92..24f91d7b0 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiRequestWrapper.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiRequestWrapper.java @@ -23,8 +23,8 @@ import org.apache.wiki.api.core.Session; import org.apache.wiki.auth.SessionMonitor; import org.apache.wiki.auth.authorize.Role; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import java.security.Principal; /** diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiServletFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiServletFilter.java index 7d2bb0004..495c2acde 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiServletFilter.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiServletFilter.java @@ -29,15 +29,15 @@ import org.apache.wiki.auth.AuthenticationManager; import org.apache.wiki.auth.SessionMonitor; import org.apache.wiki.auth.WikiSecurityException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import java.io.IOException; import java.io.PrintWriter; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java index 533d61263..674ae7640 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java @@ -22,8 +22,8 @@ import org.apache.wiki.api.core.Context; import org.apache.wiki.parser.WikiDocument; import org.apache.wiki.render.RenderingManager; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java index d6d8f14c0..246fea4a0 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java @@ -25,7 +25,7 @@ import org.apache.wiki.ui.admin.AdminBean; import org.apache.wiki.util.TextUtil; import javax.management.NotCompliantMBeanException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * This class is still experimental. diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/UserBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/UserBean.java index 073320675..067ae3ee2 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/UserBean.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/UserBean.java @@ -29,7 +29,7 @@ import org.apache.wiki.ui.admin.AdminBean; import org.apache.wiki.ui.admin.SimpleAdminBean; import javax.management.NotCompliantMBeanException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Date; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/progress/DefaultProgressManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/progress/DefaultProgressManager.java index be14611f1..76c463410 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/progress/DefaultProgressManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/progress/DefaultProgressManager.java @@ -23,8 +23,8 @@ import org.apache.logging.log4j.Logger; import org.apache.wiki.ajax.WikiAjaxDispatcherServlet; import org.apache.wiki.ajax.WikiAjaxServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java b/jspwiki-main/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java index 5d77e6efa..1817485d5 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java @@ -25,7 +25,7 @@ import org.apache.wiki.api.core.Engine; import org.apache.wiki.ui.CommandResolver; import org.apache.wiki.util.TextUtil; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.nio.charset.Charset; import java.util.Properties; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/url/ShortURLConstructor.java b/jspwiki-main/src/main/java/org/apache/wiki/url/ShortURLConstructor.java index 0df62be56..05b4c2e36 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/url/ShortURLConstructor.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/url/ShortURLConstructor.java @@ -25,7 +25,7 @@ import org.apache.wiki.api.core.ContextEnum; import org.apache.wiki.api.core.Engine; import org.apache.wiki.util.TextUtil; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.nio.charset.Charset; import java.util.Properties; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java b/jspwiki-main/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java index 0207ea404..1dc5b8c85 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java @@ -21,7 +21,7 @@ package org.apache.wiki.url; import org.apache.wiki.api.core.ContextEnum; import org.apache.wiki.api.core.Engine; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Properties; /** diff --git a/jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java b/jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java index 885339472..125bf076a 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java @@ -20,7 +20,7 @@ package org.apache.wiki.url; import org.apache.wiki.api.engine.Initializable; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.nio.charset.Charset; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java b/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java index c654eea18..bce7522bd 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java @@ -34,8 +34,8 @@ import org.apache.wiki.modules.InternalModule; import org.apache.wiki.pages.PageManager; import org.apache.wiki.preferences.Preferences; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import java.lang.reflect.Method; import java.security.Principal; import java.util.Date; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java index d320ead11..db04c11a6 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java @@ -31,11 +31,11 @@ import org.apache.xmlrpc.XmlRpcContext; import org.apache.xmlrpc.XmlRpcHandlerMapping; import org.apache.xmlrpc.XmlRpcServer; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -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.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; diff --git a/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java b/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java index 4e3766ec9..a8d926d06 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java @@ -51,8 +51,8 @@ import org.apache.wiki.util.FileUtil; import org.apache.wiki.util.PropertyReader; import org.apache.wiki.util.TextUtil; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileWriter; diff --git a/jspwiki-main/src/test/java/org/apache/wiki/WikiSessionTest.java b/jspwiki-main/src/test/java/org/apache/wiki/WikiSessionTest.java index e40fad239..0fcf12cb4 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/WikiSessionTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/WikiSessionTest.java @@ -37,15 +37,15 @@ import org.apache.wiki.ui.WikiServletFilter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import javax.servlet.Filter; -import javax.servlet.Servlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.Filter; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.security.Principal; import java.util.HashSet; diff --git a/jspwiki-main/src/test/java/org/apache/wiki/auth/AuthenticationManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/AuthenticationManagerTest.java index 7258b24b4..65fb819cd 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/auth/AuthenticationManagerTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/AuthenticationManagerTest.java @@ -33,7 +33,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.security.Principal; import java.util.Map; import java.util.Properties; diff --git a/jspwiki-main/src/test/java/org/apache/wiki/auth/TestAuthorizer.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/TestAuthorizer.java index 6f0545bfd..548df2a6c 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/auth/TestAuthorizer.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/TestAuthorizer.java @@ -23,7 +23,7 @@ import org.apache.wiki.api.core.Session; import org.apache.wiki.auth.authorize.Role; import org.apache.wiki.auth.authorize.WebAuthorizer; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.security.Principal; import java.util.Properties; @@ -82,8 +82,8 @@ public class TestAuthorizer implements WebAuthorizer { /** * Returns true if the HTTP request contains * a particular role principal. Delegates to - * {@link javax.servlet.http.HttpServletRequest#isUserInRole(String)}. - * @see org.apache.wiki.auth.authorize.WebAuthorizer#isUserInRole(javax.servlet.http.HttpServletRequest, java.security.Principal) + * {@link jakarta.servlet.http.HttpServletRequest#isUserInRole(String)}. + * @see org.apache.wiki.auth.authorize.WebAuthorizer#isUserInRole(jakarta.servlet.http.HttpServletRequest, java.security.Principal) */ @Override public boolean isUserInRole( final HttpServletRequest request, final Principal role ) { diff --git a/jspwiki-main/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java index eed86f650..f4df992f5 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java @@ -26,7 +26,7 @@ import javax.security.auth.Subject; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.LoginException; import javax.security.auth.spi.LoginModule; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.wiki.TestEngine; import org.apache.wiki.api.exceptions.NoRequiredPropertyException; diff --git a/jspwiki-main/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java index 91f53d5a9..b9f382e7f 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java @@ -33,7 +33,7 @@ import javax.security.auth.Subject; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.LoginException; import javax.security.auth.spi.LoginModule; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import java.security.Principal; import java.util.HashMap; import java.util.Properties; diff --git a/jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java b/jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java index 70a8d316d..0f3e55862 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java @@ -38,9 +38,9 @@ import org.hsqldb.jdbc.JDBCDataSource; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NameNotFoundException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.util.HashMap; diff --git a/jspwiki-markdown/pom.xml b/jspwiki-markdown/pom.xml index 658b92b01..0b53a01a9 100644 --- a/jspwiki-markdown/pom.xml +++ b/jspwiki-markdown/pom.xml @@ -122,8 +122,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api test diff --git a/jspwiki-tika-searchprovider/pom.xml b/jspwiki-tika-searchprovider/pom.xml index d69280a99..144b9a401 100644 --- a/jspwiki-tika-searchprovider/pom.xml +++ b/jspwiki-tika-searchprovider/pom.xml @@ -75,8 +75,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api test diff --git a/jspwiki-util/pom.xml b/jspwiki-util/pom.xml index efdd79cce..65a731e79 100644 --- a/jspwiki-util/pom.xml +++ b/jspwiki-util/pom.xml @@ -41,13 +41,13 @@ - javax.mail - mail + com.sun.mail + jakarta.mail - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/FormUtil.java b/jspwiki-util/src/main/java/org/apache/wiki/util/FormUtil.java index 3b17a86dc..6c4d16801 100644 --- a/jspwiki-util/src/main/java/org/apache/wiki/util/FormUtil.java +++ b/jspwiki-util/src/main/java/org/apache/wiki/util/FormUtil.java @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * A collection of (static) utilities used by the WikiForms code. diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/HttpUtil.java b/jspwiki-util/src/main/java/org/apache/wiki/util/HttpUtil.java index ad956f162..4004753b5 100644 --- a/jspwiki-util/src/main/java/org/apache/wiki/util/HttpUtil.java +++ b/jspwiki-util/src/main/java/org/apache/wiki/util/HttpUtil.java @@ -22,9 +22,9 @@ import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.text.DateFormat; diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java b/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java index 3a3720c54..e1ba4f0ec 100644 --- a/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java +++ b/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java @@ -21,10 +21,10 @@ package org.apache.wiki.util; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.mail.*; -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; +import jakarta.mail.*; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; @@ -139,7 +139,7 @@ import java.util.Properties; * 
<resource-ref>
  *   <description>Resource reference to a container-managed JNDI JavaMail factory for sending e-mails.</description>
  *   <res-ref-name>mail/Session</res-ref-name>
- *   <res-type>javax.mail.Session</res-type>
+ *   <res-type>jakarta.mail.Session</res-type>
  *   <res-auth>Container</res-auth>
  * </resource-ref>
*

To configure your container's resource factory, follow the directions supplied by @@ -151,7 +151,7 @@ import java.util.Properties; * 

<Context ...>
  * ...
  * <Resource name="mail/Session" auth="Container"
- *           type="javax.mail.Session"
+ *           type="jakarta.mail.Session"
  *           mail.smtp.host="127.0.0.1"/>
  *           mail.smtp.port="25"/>
  *           mail.smtp.account="your-account-name"/>
@@ -168,7 +168,7 @@ import java.util.Properties;
  * $CATALINA_HOME/conf/server.xml creates a global resource:

  * 
<GlobalNamingResources>
  *   <Resource name="mail/Session" auth="Container"
- *             type="javax.mail.Session"
+ *             type="jakarta.mail.Session"
  *             ...
  *             mail.smtp.starttls.enable="true"/>
  * </GlobalNamingResources>

@@ -247,7 +247,7 @@ public final class MailUtil {
      * See the top-level JavaDoc for this class for a description of
      * required properties and their default values.

      * 
The e-mail address used for the to parameter must be in
-     * RFC822 format, as described in the JavaDoc for {@link javax.mail.internet.InternetAddress}
+     * RFC822 format, as described in the JavaDoc for {@link jakarta.mail.internet.InternetAddress}
      * and more fully at
      * http://www.freesoft.org/CIE/RFC/822/index.htm.
      * In other words, e-mail addresses should look like this:

@@ -353,7 +353,7 @@ public final class MailUtil {
      * If the JavaMail property {@value #PROP_MAIL_ACCOUNT} is set to
      * a value that is non-null and of non-zero length, the
      * Session will be initialized with an instance of
-     * {@link javax.mail.Authenticator}.
+     * {@link jakarta.mail.Authenticator}.
      * @param props the properties that contain mail session properties
      * @return the initialized JavaMail Session
      */
@@ -420,7 +420,7 @@ public final class MailUtil {
     }
 
     /**
-     * Simple {@link javax.mail.Authenticator} subclass that authenticates a user to
+     * Simple {@link jakarta.mail.Authenticator} subclass that authenticates a user to
      * an SMTP server.
      */
     protected static class SmtpAuthenticator extends Authenticator {
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java b/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
index b2466ef19..5776067fc 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
@@ -23,7 +23,7 @@ import org.apache.commons.lang3.Validate;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 import java.io.*;
 import java.util.*;
 import java.util.stream.Collectors;
diff --git a/jspwiki-util/src/test/java/org/apache/wiki/util/HttpUtilTest.java b/jspwiki-util/src/test/java/org/apache/wiki/util/HttpUtilTest.java
index 1afc63e1d..7b1e3b3d4 100644
--- a/jspwiki-util/src/test/java/org/apache/wiki/util/HttpUtilTest.java
+++ b/jspwiki-util/src/test/java/org/apache/wiki/util/HttpUtilTest.java
@@ -22,7 +22,7 @@ import net.sourceforge.stripes.mock.MockHttpServletRequest;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import javax.servlet.http.Cookie;
+import jakarta.servlet.http.Cookie;
 
 
 public class HttpUtilTest {
diff --git a/jspwiki-util/src/test/java/org/apache/wiki/util/MailUtilTest.java b/jspwiki-util/src/test/java/org/apache/wiki/util/MailUtilTest.java
index c6d770590..24302add0 100644
--- a/jspwiki-util/src/test/java/org/apache/wiki/util/MailUtilTest.java
+++ b/jspwiki-util/src/test/java/org/apache/wiki/util/MailUtilTest.java
@@ -22,7 +22,7 @@ package org.apache.wiki.util;
 import java.net.ConnectException;
 import java.util.Properties;
 
-import javax.mail.MessagingException;
+import jakarta.mail.MessagingException;
 import javax.net.ssl.SSLHandshakeException;
 
 import org.junit.jupiter.api.Assertions;
diff --git a/jspwiki-war/pom.xml b/jspwiki-war/pom.xml
index 122f8a51f..e6193b023 100644
--- a/jspwiki-war/pom.xml
+++ b/jspwiki-war/pom.xml
@@ -62,14 +62,14 @@
     
 
     
-      javax.servlet
-      javax.servlet-api
+      jakarta.servlet
+      jakarta.servlet-api
       provided
     
 
     
-      javax.servlet.jsp
-      javax.servlet.jsp-api
+      jakarta.servlet.jsp
+      jakarta.servlet.jsp-api
       provided
     
   
diff --git a/jspwiki-wysiwyg/pom.xml b/jspwiki-wysiwyg/pom.xml
index d87ac62c7..5e208154c 100644
--- a/jspwiki-wysiwyg/pom.xml
+++ b/jspwiki-wysiwyg/pom.xml
@@ -52,8 +52,8 @@
     
 
     
-      javax.servlet
-      javax.servlet-api
+      jakarta.servlet
+      jakarta.servlet-api
       test
     
 
diff --git a/pom.xml b/pom.xml
index 01a513f7c..e4d2de057 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,15 +40,15 @@
     UTF-8
     UTF-8
     2022-07-30T11:42:48Z 
-    1.8
+    11
     1.1.4
-    3.5
+    3.8
 
     1.02
     4.2.0
-    1.12.176
+    1.12.288
     4.4
-    1.4
+    2.0-SNAPSHOT
     3.1
     2.11.0
     3.12.0
@@ -60,10 +60,10 @@
     2.7.0
     0.3.3
     1.2.0
-    1.2
-    1.4.7
-    2.3.3
-    3.1.0
+    3.0.0
+    2.0.1
+    3.1.0
+    6.0.0
     2.0.6
     9.4.48.v20220622
     0.4.2
@@ -143,6 +143,14 @@
     jspwiki-bom
   
 
+  
+      
+          apache-commons-snapshots
+          apache-commons-snapshots
+          https://repository.apache.org/content/repositories/snapshots/
+      
+  
+
    
            
       
@@ -201,8 +209,8 @@
       
 
       
-        commons-fileupload
-        commons-fileupload
+        org.apache.commons
+        commons-fileupload2
         ${commons-fileupload.version}
       
 
@@ -261,14 +269,14 @@
       
 
       
-        javax.mail
-        mail
+        com.sun.mail
+        jakarta.mail
         ${javax-mail.version}
       
 
       
-        javax.servlet
-        jstl
+        jakarta.servlet.jsp.jstl
+        jakarta.servlet.jsp.jstl-api
         ${javax-jstl.version}
       
 
@@ -448,14 +456,14 @@
 
       
       
-        javax.servlet.jsp
-        javax.servlet.jsp-api
+        jakarta.servlet.jsp
+        jakarta.servlet.jsp-api
         ${javax-jsp-api.version}
       
 
       
-        javax.servlet
-        javax.servlet-api
+        jakarta.servlet
+        jakarta.servlet-api
         ${javax-servlet-api.version}