diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 263c029f8..7380d89f1 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -99,8 +99,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/async/AsyncFilter.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/async/AsyncFilter.java index 95d98ca53..4ceccb4dd 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/async/AsyncFilter.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/async/AsyncFilter.java @@ -18,13 +18,13 @@ */ package org.apache.struts2.showcase.async; -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 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 java.io.IOException; /** diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatSessionListener.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatSessionListener.java index 7812cba49..85331ff24 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatSessionListener.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatSessionListener.java @@ -25,9 +25,9 @@ import org.apache.logging.log4j.LogManager; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; public class ChatSessionListener implements HttpSessionListener { diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManager.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManager.java index 5cf6b4925..207a09004 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManager.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManager.java @@ -24,8 +24,8 @@ import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.views.freemarker.FreemarkerManager; import org.apache.struts2.views.freemarker.ScopesHashModel; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** *

diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/servlet/TestServlet.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/servlet/TestServlet.java index f754bd3a6..26f82f6fe 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/servlet/TestServlet.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/servlet/TestServlet.java @@ -20,10 +20,10 @@ */ package org.apache.struts2.showcase.servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; public class TestServlet extends HttpServlet { diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java index ce5b5b949..06ceae842 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java @@ -24,7 +24,7 @@ import com.opensymphony.xwork2.ActionSupport; import com.opensymphony.xwork2.util.ClassLoaderUtil; import org.apache.struts2.action.ServletContextAware; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/BeanValidationExampleAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/BeanValidationExampleAction.java index 4c07f51e9..2d6d05723 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/BeanValidationExampleAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/BeanValidationExampleAction.java @@ -30,13 +30,13 @@ import org.apache.struts2.interceptor.validation.SkipValidation; import org.hibernate.validator.constraints.ScriptAssert; import org.hibernate.validator.constraints.URL; -import javax.validation.constraints.Email; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import java.util.Date; // diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java index 6472adf62..510ba0971 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java @@ -22,7 +22,7 @@ package org.apache.struts2.showcase.xslt; import com.opensymphony.xwork2.ActionSupport; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.struts2.action.ServletRequestAware; diff --git a/bundles/admin/src/main/java/org/apache/struts2/osgi/admin/actions/BundlesAction.java b/bundles/admin/src/main/java/org/apache/struts2/osgi/admin/actions/BundlesAction.java index 26b703002..6edceaa6f 100644 --- a/bundles/admin/src/main/java/org/apache/struts2/osgi/admin/actions/BundlesAction.java +++ b/bundles/admin/src/main/java/org/apache/struts2/osgi/admin/actions/BundlesAction.java @@ -32,7 +32,7 @@ import org.apache.struts2.action.ServletContextAware; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; diff --git a/bundles/pom.xml b/bundles/pom.xml index 408947c8f..0c9f10f64 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -51,9 +51,9 @@ - - javax.servlet - javax.servlet-api + + jakarta.servlet + jakarta.servlet-api provided diff --git a/core/pom.xml b/core/pom.xml index 26634e2d6..abffdbe49 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -190,14 +190,14 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided - javax.servlet.jsp - jsp-api + jakarta.servlet.jsp + jakarta.servlet.jsp-api provided diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionContext.java b/core/src/main/java/com/opensymphony/xwork2/ActionContext.java index fb7b0abcb..629c65c80 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ActionContext.java +++ b/core/src/main/java/com/opensymphony/xwork2/ActionContext.java @@ -26,10 +26,10 @@ import org.apache.struts2.StrutsStatics; import org.apache.struts2.dispatcher.HttpParameters; import org.apache.struts2.dispatcher.mapper.ActionMapping; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.PageContext; import java.io.Serializable; import java.util.HashMap; import java.util.Locale; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/ServletContextAwareConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/ServletContextAwareConfigurationProvider.java index 20933d667..8dcd3eef7 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/ServletContextAwareConfigurationProvider.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/ServletContextAwareConfigurationProvider.java @@ -18,7 +18,7 @@ */ package com.opensymphony.xwork2.config; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; /** * Dedicated interface to allow inject {@link ServletContext} and perform initialisation based in it diff --git a/core/src/main/java/org/apache/struts2/RequestUtils.java b/core/src/main/java/org/apache/struts2/RequestUtils.java index 40ed2ddb0..fecd46197 100644 --- a/core/src/main/java/org/apache/struts2/RequestUtils.java +++ b/core/src/main/java/org/apache/struts2/RequestUtils.java @@ -23,7 +23,7 @@ import org.apache.commons.lang3.time.FastDateFormat; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.text.ParseException; import java.util.Date; import java.util.Locale; diff --git a/core/src/main/java/org/apache/struts2/ServletActionContext.java b/core/src/main/java/org/apache/struts2/ServletActionContext.java index 24a442211..bf0cd8493 100644 --- a/core/src/main/java/org/apache/struts2/ServletActionContext.java +++ b/core/src/main/java/org/apache/struts2/ServletActionContext.java @@ -22,10 +22,10 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.dispatcher.mapper.ActionMapping; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.PageContext; /** * Web-specific context information for actions. This class subclasses ActionContext which diff --git a/core/src/main/java/org/apache/struts2/StrutsStatics.java b/core/src/main/java/org/apache/struts2/StrutsStatics.java index e0adccc7a..da03f8f51 100644 --- a/core/src/main/java/org/apache/struts2/StrutsStatics.java +++ b/core/src/main/java/org/apache/struts2/StrutsStatics.java @@ -18,7 +18,7 @@ */ package org.apache.struts2; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; /** *

diff --git a/core/src/main/java/org/apache/struts2/action/CspReportAction.java b/core/src/main/java/org/apache/struts2/action/CspReportAction.java index 187e7ee61..914565ad8 100644 --- a/core/src/main/java/org/apache/struts2/action/CspReportAction.java +++ b/core/src/main/java/org/apache/struts2/action/CspReportAction.java @@ -20,8 +20,8 @@ package org.apache.struts2.action; import com.opensymphony.xwork2.ActionSupport; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.BufferedReader; import java.io.IOException; diff --git a/core/src/main/java/org/apache/struts2/action/ServletContextAware.java b/core/src/main/java/org/apache/struts2/action/ServletContextAware.java index d9c5161e2..ec3d7ed2b 100644 --- a/core/src/main/java/org/apache/struts2/action/ServletContextAware.java +++ b/core/src/main/java/org/apache/struts2/action/ServletContextAware.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.action; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; /** * For components that have a dependence on the Servlet context. diff --git a/core/src/main/java/org/apache/struts2/action/ServletRequestAware.java b/core/src/main/java/org/apache/struts2/action/ServletRequestAware.java index 115bff35e..6f166fd0e 100644 --- a/core/src/main/java/org/apache/struts2/action/ServletRequestAware.java +++ b/core/src/main/java/org/apache/struts2/action/ServletRequestAware.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.action; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * All Actions that want to have access to the servlet request object must implement this interface. diff --git a/core/src/main/java/org/apache/struts2/action/ServletResponseAware.java b/core/src/main/java/org/apache/struts2/action/ServletResponseAware.java index 0403f1f9c..12da41c35 100644 --- a/core/src/main/java/org/apache/struts2/action/ServletResponseAware.java +++ b/core/src/main/java/org/apache/struts2/action/ServletResponseAware.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.action; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; /** * All Actions that want to have access to the servlet response object must implement this interface. diff --git a/core/src/main/java/org/apache/struts2/components/ActionComponent.java b/core/src/main/java/org/apache/struts2/components/ActionComponent.java index 521db09c0..051df9516 100644 --- a/core/src/main/java/org/apache/struts2/components/ActionComponent.java +++ b/core/src/main/java/org/apache/struts2/components/ActionComponent.java @@ -38,9 +38,9 @@ import org.apache.struts2.dispatcher.mapper.ActionMapping; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -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.IOException; import java.io.Writer; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/components/ActionError.java b/core/src/main/java/org/apache/struts2/components/ActionError.java index 5e41b54b3..aadb40fc8 100644 --- a/core/src/main/java/org/apache/struts2/components/ActionError.java +++ b/core/src/main/java/org/apache/struts2/components/ActionError.java @@ -23,8 +23,8 @@ import org.apache.commons.lang3.StringUtils; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/org/apache/struts2/components/ActionMessage.java b/core/src/main/java/org/apache/struts2/components/ActionMessage.java index 33a26cf77..46ad4ef16 100644 --- a/core/src/main/java/org/apache/struts2/components/ActionMessage.java +++ b/core/src/main/java/org/apache/struts2/components/ActionMessage.java @@ -23,8 +23,8 @@ import org.apache.commons.lang3.StringUtils; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/org/apache/struts2/components/Anchor.java b/core/src/main/java/org/apache/struts2/components/Anchor.java index ba9d84ac9..6b833da1d 100644 --- a/core/src/main/java/org/apache/struts2/components/Anchor.java +++ b/core/src/main/java/org/apache/struts2/components/Anchor.java @@ -28,8 +28,8 @@ import org.apache.struts2.StrutsConstants; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.StringWriter; import java.io.Writer; import java.util.LinkedHashMap; diff --git a/core/src/main/java/org/apache/struts2/components/Checkbox.java b/core/src/main/java/org/apache/struts2/components/Checkbox.java index 49e054eb1..6c6160b9b 100644 --- a/core/src/main/java/org/apache/struts2/components/Checkbox.java +++ b/core/src/main/java/org/apache/struts2/components/Checkbox.java @@ -24,8 +24,8 @@ import org.apache.struts2.StrutsConstants; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * diff --git a/core/src/main/java/org/apache/struts2/components/CheckboxList.java b/core/src/main/java/org/apache/struts2/components/CheckboxList.java index 601ce5bdf..fe9a2436c 100644 --- a/core/src/main/java/org/apache/struts2/components/CheckboxList.java +++ b/core/src/main/java/org/apache/struts2/components/CheckboxList.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.views.annotations.StrutsTag; diff --git a/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java b/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java index c9785cf01..db7230bdd 100644 --- a/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java @@ -23,8 +23,8 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.Writer; /** diff --git a/core/src/main/java/org/apache/struts2/components/ComboBox.java b/core/src/main/java/org/apache/struts2/components/ComboBox.java index cfc2cd1ba..8356404e7 100644 --- a/core/src/main/java/org/apache/struts2/components/ComboBox.java +++ b/core/src/main/java/org/apache/struts2/components/ComboBox.java @@ -23,8 +23,8 @@ import org.apache.struts2.util.MakeIterator; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Collection; import java.util.Iterator; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/components/Component.java b/core/src/main/java/org/apache/struts2/components/Component.java index ba0d672bf..d5633f7a8 100644 --- a/core/src/main/java/org/apache/struts2/components/Component.java +++ b/core/src/main/java/org/apache/struts2/components/Component.java @@ -38,8 +38,8 @@ import org.apache.struts2.util.FastByteArrayOutputStream; import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.views.util.UrlHelper; -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.io.PrintWriter; import java.io.Writer; diff --git a/core/src/main/java/org/apache/struts2/components/ComponentUrlProvider.java b/core/src/main/java/org/apache/struts2/components/ComponentUrlProvider.java index c4fdfd395..e1e71d061 100644 --- a/core/src/main/java/org/apache/struts2/components/ComponentUrlProvider.java +++ b/core/src/main/java/org/apache/struts2/components/ComponentUrlProvider.java @@ -20,8 +20,8 @@ package org.apache.struts2.components; import com.opensymphony.xwork2.util.ValueStack; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Map; /** diff --git a/core/src/main/java/org/apache/struts2/components/DateTextField.java b/core/src/main/java/org/apache/struts2/components/DateTextField.java index 1645a9395..f55d3f76d 100644 --- a/core/src/main/java/org/apache/struts2/components/DateTextField.java +++ b/core/src/main/java/org/apache/struts2/components/DateTextField.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; diff --git a/core/src/main/java/org/apache/struts2/components/Debug.java b/core/src/main/java/org/apache/struts2/components/Debug.java index e1c72fb28..1073dba63 100644 --- a/core/src/main/java/org/apache/struts2/components/Debug.java +++ b/core/src/main/java/org/apache/struts2/components/Debug.java @@ -22,8 +22,8 @@ import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.reflection.ReflectionProvider; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; import java.io.Writer; import java.util.Iterator; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java b/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java index 9c4e30a0c..09fab37fb 100644 --- a/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java @@ -21,8 +21,8 @@ package org.apache.struts2.components; import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Map; /** diff --git a/core/src/main/java/org/apache/struts2/components/DoubleSelect.java b/core/src/main/java/org/apache/struts2/components/DoubleSelect.java index a6f96b114..cf102d252 100644 --- a/core/src/main/java/org/apache/struts2/components/DoubleSelect.java +++ b/core/src/main/java/org/apache/struts2/components/DoubleSelect.java @@ -22,8 +22,8 @@ import com.opensymphony.xwork2.util.ValueStack; import org.apache.commons.lang3.StringUtils; import org.apache.struts2.views.annotations.StrutsTag; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * diff --git a/core/src/main/java/org/apache/struts2/components/FieldError.java b/core/src/main/java/org/apache/struts2/components/FieldError.java index 9b3052026..7e0095ab5 100644 --- a/core/src/main/java/org/apache/struts2/components/FieldError.java +++ b/core/src/main/java/org/apache/struts2/components/FieldError.java @@ -23,8 +23,8 @@ import org.apache.struts2.components.Param.UnnamedParametric; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/org/apache/struts2/components/File.java b/core/src/main/java/org/apache/struts2/components/File.java index 09b91a7ad..adef610f0 100644 --- a/core/src/main/java/org/apache/struts2/components/File.java +++ b/core/src/main/java/org/apache/struts2/components/File.java @@ -24,8 +24,8 @@ import org.apache.logging.log4j.Logger; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * diff --git a/core/src/main/java/org/apache/struts2/components/Form.java b/core/src/main/java/org/apache/struts2/components/Form.java index 92758fbee..43d162f24 100644 --- a/core/src/main/java/org/apache/struts2/components/Form.java +++ b/core/src/main/java/org/apache/struts2/components/Form.java @@ -38,8 +38,8 @@ import org.apache.struts2.dispatcher.mapper.ActionMapping; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/main/java/org/apache/struts2/components/FormButton.java b/core/src/main/java/org/apache/struts2/components/FormButton.java index 0ed08d47b..5f70c5b02 100644 --- a/core/src/main/java/org/apache/struts2/components/FormButton.java +++ b/core/src/main/java/org/apache/struts2/components/FormButton.java @@ -24,8 +24,8 @@ import org.apache.struts2.dispatcher.mapper.ActionMapper; import org.apache.struts2.dispatcher.mapper.ActionMapping; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * FormButton. diff --git a/core/src/main/java/org/apache/struts2/components/GenericUIBean.java b/core/src/main/java/org/apache/struts2/components/GenericUIBean.java index fbf8776ed..2e0ac3cf1 100644 --- a/core/src/main/java/org/apache/struts2/components/GenericUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/GenericUIBean.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.util.ContainUtil; diff --git a/core/src/main/java/org/apache/struts2/components/Head.java b/core/src/main/java/org/apache/struts2/components/Head.java index b09f51049..1bd28a9b1 100644 --- a/core/src/main/java/org/apache/struts2/components/Head.java +++ b/core/src/main/java/org/apache/struts2/components/Head.java @@ -23,8 +23,8 @@ import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.StrutsConstants; import org.apache.struts2.views.annotations.StrutsTag; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * diff --git a/core/src/main/java/org/apache/struts2/components/Hidden.java b/core/src/main/java/org/apache/struts2/components/Hidden.java index 74875d5a9..205ad0cdf 100644 --- a/core/src/main/java/org/apache/struts2/components/Hidden.java +++ b/core/src/main/java/org/apache/struts2/components/Hidden.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.views.annotations.StrutsTag; diff --git a/core/src/main/java/org/apache/struts2/components/Include.java b/core/src/main/java/org/apache/struts2/components/Include.java index 2e1f862dd..27d1ef9ff 100644 --- a/core/src/main/java/org/apache/struts2/components/Include.java +++ b/core/src/main/java/org/apache/struts2/components/Include.java @@ -30,14 +30,14 @@ import org.apache.struts2.util.FastByteArrayOutputStream; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.ServletRequest; -import javax.servlet.WriteListener; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.WriteListener; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; import java.io.*; import java.net.URLEncoder; diff --git a/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java b/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java index 762bafc5b..1cab765e8 100644 --- a/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java +++ b/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java @@ -25,8 +25,8 @@ import org.apache.logging.log4j.Logger; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.LinkedHashMap; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/components/Label.java b/core/src/main/java/org/apache/struts2/components/Label.java index c09b88c80..2ffc5d7f8 100644 --- a/core/src/main/java/org/apache/struts2/components/Label.java +++ b/core/src/main/java/org/apache/struts2/components/Label.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; diff --git a/core/src/main/java/org/apache/struts2/components/Link.java b/core/src/main/java/org/apache/struts2/components/Link.java index b7668494f..e147f58ac 100644 --- a/core/src/main/java/org/apache/struts2/components/Link.java +++ b/core/src/main/java/org/apache/struts2/components/Link.java @@ -23,8 +23,8 @@ import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** *

diff --git a/core/src/main/java/org/apache/struts2/components/ListUIBean.java b/core/src/main/java/org/apache/struts2/components/ListUIBean.java index bfaffe6f1..362220cf6 100644 --- a/core/src/main/java/org/apache/struts2/components/ListUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/ListUIBean.java @@ -24,8 +24,8 @@ import org.apache.struts2.util.ContainUtil; import org.apache.struts2.util.MakeIterator; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.lang.reflect.Array; import java.util.Collection; import java.util.Collections; diff --git a/core/src/main/java/org/apache/struts2/components/OptGroup.java b/core/src/main/java/org/apache/struts2/components/OptGroup.java index 5f2e2ace2..6483ad209 100644 --- a/core/src/main/java/org/apache/struts2/components/OptGroup.java +++ b/core/src/main/java/org/apache/struts2/components/OptGroup.java @@ -22,8 +22,8 @@ import java.io.Writer; import java.util.ArrayList; import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; diff --git a/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java b/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java index bdc4905df..56a48a169 100644 --- a/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java +++ b/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java @@ -25,8 +25,8 @@ import org.apache.logging.log4j.Logger; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.LinkedHashMap; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/components/Password.java b/core/src/main/java/org/apache/struts2/components/Password.java index d8e106457..637cca00a 100644 --- a/core/src/main/java/org/apache/struts2/components/Password.java +++ b/core/src/main/java/org/apache/struts2/components/Password.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; diff --git a/core/src/main/java/org/apache/struts2/components/Radio.java b/core/src/main/java/org/apache/struts2/components/Radio.java index 7ef81000a..8dde28a75 100644 --- a/core/src/main/java/org/apache/struts2/components/Radio.java +++ b/core/src/main/java/org/apache/struts2/components/Radio.java @@ -22,8 +22,8 @@ import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * diff --git a/core/src/main/java/org/apache/struts2/components/Reset.java b/core/src/main/java/org/apache/struts2/components/Reset.java index c1de8cc24..5da1b4936 100644 --- a/core/src/main/java/org/apache/struts2/components/Reset.java +++ b/core/src/main/java/org/apache/struts2/components/Reset.java @@ -22,8 +22,8 @@ import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * diff --git a/core/src/main/java/org/apache/struts2/components/Script.java b/core/src/main/java/org/apache/struts2/components/Script.java index 447eaf7cd..cc4061bf0 100644 --- a/core/src/main/java/org/apache/struts2/components/Script.java +++ b/core/src/main/java/org/apache/struts2/components/Script.java @@ -22,8 +22,8 @@ import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** diff --git a/core/src/main/java/org/apache/struts2/components/Select.java b/core/src/main/java/org/apache/struts2/components/Select.java index 63b2c2cbe..adc19c86e 100644 --- a/core/src/main/java/org/apache/struts2/components/Select.java +++ b/core/src/main/java/org/apache/struts2/components/Select.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; diff --git a/core/src/main/java/org/apache/struts2/components/Submit.java b/core/src/main/java/org/apache/struts2/components/Submit.java index 7d13d3b85..09ec301ee 100644 --- a/core/src/main/java/org/apache/struts2/components/Submit.java +++ b/core/src/main/java/org/apache/struts2/components/Submit.java @@ -20,8 +20,8 @@ package org.apache.struts2.components; import java.io.Writer; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.opensymphony.xwork2.inject.Inject; import org.apache.commons.lang3.BooleanUtils; diff --git a/core/src/main/java/org/apache/struts2/components/TextArea.java b/core/src/main/java/org/apache/struts2/components/TextArea.java index 0d03991c6..b61f595cb 100644 --- a/core/src/main/java/org/apache/struts2/components/TextArea.java +++ b/core/src/main/java/org/apache/struts2/components/TextArea.java @@ -22,8 +22,8 @@ import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * diff --git a/core/src/main/java/org/apache/struts2/components/TextField.java b/core/src/main/java/org/apache/struts2/components/TextField.java index 07a983c27..f03ef8024 100644 --- a/core/src/main/java/org/apache/struts2/components/TextField.java +++ b/core/src/main/java/org/apache/struts2/components/TextField.java @@ -22,8 +22,8 @@ import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * diff --git a/core/src/main/java/org/apache/struts2/components/Token.java b/core/src/main/java/org/apache/struts2/components/Token.java index 53a361f4f..89d5e2394 100644 --- a/core/src/main/java/org/apache/struts2/components/Token.java +++ b/core/src/main/java/org/apache/struts2/components/Token.java @@ -20,8 +20,8 @@ package org.apache.struts2.components; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.util.TokenHelper; diff --git a/core/src/main/java/org/apache/struts2/components/UIBean.java b/core/src/main/java/org/apache/struts2/components/UIBean.java index 59d3713ed..d501442fb 100644 --- a/core/src/main/java/org/apache/struts2/components/UIBean.java +++ b/core/src/main/java/org/apache/struts2/components/UIBean.java @@ -38,8 +38,8 @@ import org.apache.struts2.util.TextProviderHelper; import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.views.util.ContextUtil; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.Writer; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/core/src/main/java/org/apache/struts2/components/URL.java b/core/src/main/java/org/apache/struts2/components/URL.java index 0656340d4..5f9198e8b 100644 --- a/core/src/main/java/org/apache/struts2/components/URL.java +++ b/core/src/main/java/org/apache/struts2/components/URL.java @@ -24,8 +24,8 @@ import org.apache.struts2.StrutsConstants; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.Writer; /** diff --git a/core/src/main/java/org/apache/struts2/components/UpDownSelect.java b/core/src/main/java/org/apache/struts2/components/UpDownSelect.java index 77dd5d67d..238cf4410 100644 --- a/core/src/main/java/org/apache/struts2/components/UpDownSelect.java +++ b/core/src/main/java/org/apache/struts2/components/UpDownSelect.java @@ -25,8 +25,8 @@ import org.apache.logging.log4j.Logger; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.LinkedHashMap; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/components/UrlProvider.java b/core/src/main/java/org/apache/struts2/components/UrlProvider.java index 8c3b79040..cf1e56256 100644 --- a/core/src/main/java/org/apache/struts2/components/UrlProvider.java +++ b/core/src/main/java/org/apache/struts2/components/UrlProvider.java @@ -20,8 +20,8 @@ package org.apache.struts2.components; import com.opensymphony.xwork2.util.ValueStack; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Map; /** diff --git a/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java index 050ffb195..e8b5743f7 100644 --- a/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java +++ b/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java @@ -23,7 +23,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.ServletActionContext; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.*; import java.util.Map; import java.util.Properties; diff --git a/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java index 91e155867..d4e1988be 100644 --- a/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java +++ b/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java @@ -31,9 +31,9 @@ import org.apache.logging.log4j.Logger; import org.apache.struts2.ServletActionContext; import org.apache.struts2.views.freemarker.FreemarkerManager; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.Writer; import java.util.List; diff --git a/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java index 1b9523001..5c308bb9a 100644 --- a/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java +++ b/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java @@ -27,8 +27,8 @@ import org.apache.struts2.StrutsConstants; import org.apache.struts2.components.Include; import org.apache.struts2.components.UIBean; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.PageContext; import java.util.List; /** diff --git a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java index 9b62b3d59..b3624b832 100644 --- a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java @@ -28,7 +28,7 @@ import com.opensymphony.xwork2.util.location.LocatableProperties; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.File; import java.io.IOException; import java.net.MalformedURLException; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java b/core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java index f0c5b4bf2..29977aa93 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java @@ -24,7 +24,7 @@ import java.util.Enumeration; import java.util.HashSet; import java.util.Set; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; /** * A simple implementation of the {@link java.util.Map} interface to handle a collection of attributes and diff --git a/core/src/main/java/org/apache/struts2/dispatcher/AttributeMap.java b/core/src/main/java/org/apache/struts2/dispatcher/AttributeMap.java index dbdc686bb..5dfbf3819 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/AttributeMap.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/AttributeMap.java @@ -20,7 +20,7 @@ package org.apache.struts2.dispatcher; import org.apache.struts2.StrutsStatics; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.jsp.PageContext; import java.util.AbstractMap; import java.util.Collection; import java.util.Collections; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java b/core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java index 7fa83fc87..c6f07795e 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.dispatcher; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.struts2.ServletActionContext; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/DefaultDispatcherErrorHandler.java b/core/src/main/java/org/apache/struts2/dispatcher/DefaultDispatcherErrorHandler.java index 551ff1e6a..4fc110664 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/DefaultDispatcherErrorHandler.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/DefaultDispatcherErrorHandler.java @@ -29,9 +29,9 @@ import org.apache.struts2.StrutsConstants; import org.apache.struts2.StrutsException; import org.apache.struts2.views.freemarker.FreemarkerManager; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java b/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java index 0ec528602..55f9e096c 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java @@ -26,8 +26,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsConstants; -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.io.InputStream; import java.io.OutputStream; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java index e378633e2..e1ef230f7 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java @@ -70,10 +70,10 @@ import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper; import org.apache.struts2.util.ObjectFactoryDestroyable; import org.apache.struts2.util.fs.JBossFileManager; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +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.Collection; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/DispatcherErrorHandler.java b/core/src/main/java/org/apache/struts2/dispatcher/DispatcherErrorHandler.java index baf21c3de..a7837bde4 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/DispatcherErrorHandler.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/DispatcherErrorHandler.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.dispatcher; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Implementation of this interface is used to handle internal errors or missing resources. diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ExecuteOperations.java b/core/src/main/java/org/apache/struts2/dispatcher/ExecuteOperations.java index 8671688de..cf5cb1827 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ExecuteOperations.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ExecuteOperations.java @@ -21,9 +21,9 @@ package org.apache.struts2.dispatcher; import org.apache.struts2.dispatcher.mapper.ActionMapping; import org.apache.struts2.RequestUtils; -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; /** diff --git a/core/src/main/java/org/apache/struts2/dispatcher/HostConfig.java b/core/src/main/java/org/apache/struts2/dispatcher/HostConfig.java index 44b65eba7..14f15fcfa 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/HostConfig.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/HostConfig.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.dispatcher; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.util.Iterator; /** diff --git a/core/src/main/java/org/apache/struts2/dispatcher/MockDispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/MockDispatcher.java index b10014995..1c7ad289d 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/MockDispatcher.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/MockDispatcher.java @@ -20,7 +20,7 @@ package org.apache.struts2.dispatcher; import com.opensymphony.xwork2.config.ConfigurationManager; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java b/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java index a643de310..47ad8e84e 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java @@ -29,9 +29,9 @@ import org.apache.struts2.StrutsException; import org.apache.struts2.dispatcher.mapper.ActionMapper; import org.apache.struts2.dispatcher.mapper.ActionMapping; -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.HashMap; import java.util.List; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/RequestMap.java b/core/src/main/java/org/apache/struts2/dispatcher/RequestMap.java index b8e5b8e67..e8c1baa29 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/RequestMap.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/RequestMap.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.dispatcher; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.Serializable; import java.util.AbstractMap; import java.util.Enumeration; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java b/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java index 8fe5777ea..a4ff557f3 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.dispatcher; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import java.io.Serializable; import java.util.AbstractMap; import java.util.Collections; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/StaticContentLoader.java b/core/src/main/java/org/apache/struts2/dispatcher/StaticContentLoader.java index f3a15e5ea..149b18c81 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/StaticContentLoader.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/StaticContentLoader.java @@ -24,8 +24,8 @@ import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsConstants; import org.apache.struts2.config.StrutsBeanSelectionProvider; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java b/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java index 233f09579..ebb4145a2 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java @@ -21,8 +21,8 @@ package org.apache.struts2.dispatcher; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.util.ValueStack; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import static org.apache.commons.lang3.BooleanUtils.isTrue; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/filter/FilterHostConfig.java b/core/src/main/java/org/apache/struts2/dispatcher/filter/FilterHostConfig.java index 783c2b28a..68f1b4f9c 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/filter/FilterHostConfig.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/filter/FilterHostConfig.java @@ -20,8 +20,8 @@ package org.apache.struts2.dispatcher.filter; import org.apache.struts2.util.MakeIterator; -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletContext; import java.util.Iterator; import org.apache.struts2.dispatcher.HostConfig; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsExecuteFilter.java b/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsExecuteFilter.java index 5328ac3a9..c59c1f4d5 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsExecuteFilter.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsExecuteFilter.java @@ -25,14 +25,14 @@ import org.apache.struts2.dispatcher.InitOperations; import org.apache.struts2.dispatcher.PrepareOperations; import org.apache.struts2.dispatcher.mapper.ActionMapping; -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/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java b/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java index e91a1b9a8..e5f45d5b5 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java @@ -28,14 +28,14 @@ import org.apache.struts2.dispatcher.InitOperations; import org.apache.struts2.dispatcher.PrepareOperations; import org.apache.struts2.dispatcher.mapper.ActionMapping; -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; import java.util.List; import java.util.regex.Pattern; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java b/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java index 81dffb6a7..11191aa74 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java @@ -23,14 +23,14 @@ import org.apache.struts2.dispatcher.Dispatcher; import org.apache.struts2.dispatcher.InitOperations; import org.apache.struts2.dispatcher.PrepareOperations; -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; import java.util.List; import java.util.regex.Pattern; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/listener/ListenerHostConfig.java b/core/src/main/java/org/apache/struts2/dispatcher/listener/ListenerHostConfig.java index fa7525141..08e3befd1 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/listener/ListenerHostConfig.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/listener/ListenerHostConfig.java @@ -20,7 +20,7 @@ package org.apache.struts2.dispatcher.listener; import org.apache.struts2.dispatcher.HostConfig; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.util.Iterator; import java.util.Collections; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/listener/StrutsListener.java b/core/src/main/java/org/apache/struts2/dispatcher/listener/StrutsListener.java index 5bdeee1c9..06a4a440e 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/listener/StrutsListener.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/listener/StrutsListener.java @@ -23,8 +23,8 @@ import org.apache.struts2.dispatcher.Dispatcher; import org.apache.struts2.dispatcher.InitOperations; import org.apache.struts2.dispatcher.PrepareOperations; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; /** * Servlet listener for Struts. The preferred way to use Struts is as a filter via the diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapper.java index ecb4f52d4..dd81a463f 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapper.java @@ -20,7 +20,7 @@ package org.apache.struts2.dispatcher.mapper; import com.opensymphony.xwork2.config.ConfigurationManager; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java index 81fa7cd45..22c9dd8d6 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java @@ -26,7 +26,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsConstants; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.LinkedList; import java.util.List; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java index 96dae07c4..00c808549 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java @@ -33,7 +33,7 @@ import org.apache.struts2.RequestUtils; import org.apache.struts2.StrutsConstants; import org.apache.struts2.util.PrefixTrie; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/PrefixBasedActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/PrefixBasedActionMapper.java index 13aade8e9..301db2705 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/PrefixBasedActionMapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/PrefixBasedActionMapper.java @@ -27,7 +27,7 @@ import org.apache.logging.log4j.Logger; import org.apache.struts2.RequestUtils; import org.apache.struts2.StrutsConstants; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java index 1a11b06bf..29c2ff4b4 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java @@ -26,7 +26,7 @@ import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsConstants; import org.apache.struts2.url.UrlDecoder; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.StringTokenizer; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java index 1709834a1..9bbe34af2 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java @@ -25,7 +25,7 @@ import org.apache.logging.log4j.Logger; import org.apache.struts2.RequestUtils; import org.apache.struts2.url.UrlDecoder; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.Map; import java.util.StringTokenizer; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java index 23d879ba4..e46470ea2 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java @@ -25,7 +25,7 @@ import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsConstants; import org.apache.struts2.dispatcher.LocalizedMessage; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java index 1c0f458a0..b56748899 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java @@ -31,7 +31,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.dispatcher.LocalizedMessage; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.File; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java index 428ae112f..0b31ac124 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java @@ -29,7 +29,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.dispatcher.LocalizedMessage; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.BufferedOutputStream; import java.io.File; import java.io.IOException; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequest.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequest.java index 445dcd9a2..4c974087d 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequest.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.dispatcher.multipart; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.struts2.dispatcher.LocalizedMessage; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java index d37eed143..ebc861f4e 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java @@ -24,7 +24,7 @@ import org.apache.logging.log4j.Logger; import org.apache.struts2.dispatcher.LocalizedMessage; import org.apache.struts2.dispatcher.StrutsRequestWrapper; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.*; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/servlet/ServletHostConfig.java b/core/src/main/java/org/apache/struts2/dispatcher/servlet/ServletHostConfig.java index f8b01ddb1..7863ea9c9 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/servlet/ServletHostConfig.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/servlet/ServletHostConfig.java @@ -20,8 +20,8 @@ package org.apache.struts2.dispatcher.servlet; import org.apache.struts2.util.MakeIterator; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; import java.util.Iterator; import org.apache.struts2.dispatcher.HostConfig; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/servlet/StrutsServlet.java b/core/src/main/java/org/apache/struts2/dispatcher/servlet/StrutsServlet.java index f11ea5071..2c8c11377 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/servlet/StrutsServlet.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/servlet/StrutsServlet.java @@ -24,11 +24,11 @@ import org.apache.struts2.dispatcher.InitOperations; import org.apache.struts2.dispatcher.PrepareOperations; import org.apache.struts2.dispatcher.mapper.ActionMapping; -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; /** diff --git a/core/src/main/java/org/apache/struts2/interceptor/CoepInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CoepInterceptor.java index 850556e32..bb6294493 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/CoepInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/CoepInterceptor.java @@ -25,8 +25,8 @@ import com.opensymphony.xwork2.util.TextParseUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.HashSet; import java.util.Set; diff --git a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java index eb40c3a53..650c79f30 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java @@ -30,7 +30,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.ServletActionContext; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/interceptor/CookieProvider.java b/core/src/main/java/org/apache/struts2/interceptor/CookieProvider.java index b4eb73eea..6d769e27b 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/CookieProvider.java +++ b/core/src/main/java/org/apache/struts2/interceptor/CookieProvider.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.interceptor; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import java.util.Set; /** diff --git a/core/src/main/java/org/apache/struts2/interceptor/CookieProviderInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CookieProviderInterceptor.java index e04c3fa73..50c40141c 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/CookieProviderInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/CookieProviderInterceptor.java @@ -26,8 +26,8 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; import org.apache.struts2.StrutsStatics; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; import java.util.Set; /** diff --git a/core/src/main/java/org/apache/struts2/interceptor/CoopInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CoopInterceptor.java index 123170baf..9cf9fe9f1 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/CoopInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/CoopInterceptor.java @@ -25,8 +25,8 @@ import com.opensymphony.xwork2.util.TextParseUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.HashSet; import java.util.Set; diff --git a/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java index d743e4e8a..1392aaf95 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java @@ -26,8 +26,8 @@ import org.apache.logging.log4j.Logger; import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.SessionMap; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; /** * diff --git a/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java index 8d487661d..ae15a3721 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java @@ -36,7 +36,7 @@ import org.apache.struts2.interceptor.exec.StrutsExecutorProvider; import org.apache.struts2.util.TokenHelper; import org.apache.struts2.views.freemarker.FreemarkerResult; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import java.util.Map; /** diff --git a/core/src/main/java/org/apache/struts2/interceptor/FetchMetadataInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/FetchMetadataInterceptor.java index 0f46206f2..e57a6a8ff 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/FetchMetadataInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/FetchMetadataInterceptor.java @@ -26,8 +26,8 @@ import com.opensymphony.xwork2.util.TextParseUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.HashSet; import java.util.Set; diff --git a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java index 86f8a64be..5fe9a2003 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java @@ -28,7 +28,8 @@ import org.apache.struts2.dispatcher.Parameter; import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper; import org.apache.struts2.dispatcher.multipart.UploadedFile; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; +import java.text.NumberFormat; import java.util.ArrayList; import java.util.Enumeration; import java.util.HashMap; diff --git a/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java index e0f978f6e..e64d891b0 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java @@ -32,9 +32,9 @@ import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.HttpParameters; import org.apache.struts2.dispatcher.Parameter; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.util.Collections; import java.util.Enumeration; diff --git a/core/src/main/java/org/apache/struts2/interceptor/PrincipalProxy.java b/core/src/main/java/org/apache/struts2/interceptor/PrincipalProxy.java index d8c11b6a3..f739b13b7 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/PrincipalProxy.java +++ b/core/src/main/java/org/apache/struts2/interceptor/PrincipalProxy.java @@ -20,7 +20,7 @@ package org.apache.struts2.interceptor; import java.security.Principal; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Proxy interface used together with PrincipalAware interface. It allows indirect diff --git a/core/src/main/java/org/apache/struts2/interceptor/ResourceIsolationPolicy.java b/core/src/main/java/org/apache/struts2/interceptor/ResourceIsolationPolicy.java index 305b97163..2a26ff5a3 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ResourceIsolationPolicy.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ResourceIsolationPolicy.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.interceptor; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Interface for the resource isolation policies to be used for fetch metadata checks. diff --git a/core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java index f5d6c2c05..5a606d437 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java @@ -24,8 +24,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.ServletActionContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java index f54c5e35f..e26c1247d 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.interceptor; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.StrutsStatics; import org.apache.struts2.action.ApplicationAware; diff --git a/core/src/main/java/org/apache/struts2/interceptor/StrutsResourceIsolationPolicy.java b/core/src/main/java/org/apache/struts2/interceptor/StrutsResourceIsolationPolicy.java index 24e0e7f8d..411e330ae 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/StrutsResourceIsolationPolicy.java +++ b/core/src/main/java/org/apache/struts2/interceptor/StrutsResourceIsolationPolicy.java @@ -20,7 +20,7 @@ package org.apache.struts2.interceptor; import org.apache.logging.log4j.util.Strings; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * diff --git a/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java index c6859d05b..753d99d1d 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java @@ -29,7 +29,7 @@ import org.apache.logging.log4j.Logger; import org.apache.struts2.ServletActionContext; import org.apache.struts2.util.TokenHelper; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; /** * diff --git a/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java index 05e491eeb..99180992b 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java @@ -27,9 +27,9 @@ import org.apache.struts2.dispatcher.HttpParameters; import org.apache.struts2.util.InvocationSessionStore; import org.apache.struts2.util.TokenHelper; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; /** * diff --git a/core/src/main/java/org/apache/struts2/interceptor/csp/CspInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/csp/CspInterceptor.java index 8e4356646..14849dc71 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/csp/CspInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/csp/CspInterceptor.java @@ -24,8 +24,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.action.CspSettingsAware; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.net.URI; import java.util.Optional; diff --git a/core/src/main/java/org/apache/struts2/interceptor/csp/CspSettings.java b/core/src/main/java/org/apache/struts2/interceptor/csp/CspSettings.java index acb142962..cf970abb5 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/csp/CspSettings.java +++ b/core/src/main/java/org/apache/struts2/interceptor/csp/CspSettings.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.interceptor.csp; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * CspSettings interface used by the {@link CspInterceptor} to add the CSP header to the response. diff --git a/core/src/main/java/org/apache/struts2/interceptor/csp/DefaultCspSettings.java b/core/src/main/java/org/apache/struts2/interceptor/csp/DefaultCspSettings.java index d1768e869..9e5b6180a 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/csp/DefaultCspSettings.java +++ b/core/src/main/java/org/apache/struts2/interceptor/csp/DefaultCspSettings.java @@ -21,8 +21,8 @@ package org.apache.struts2.interceptor.csp; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.security.SecureRandom; import java.util.Base64; import java.util.Objects; diff --git a/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java index 7f116829e..4daec590b 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java @@ -36,7 +36,7 @@ import org.apache.struts2.dispatcher.RequestMap; import org.apache.struts2.views.freemarker.FreemarkerManager; import org.apache.struts2.views.freemarker.FreemarkerResult; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.beans.BeanInfo; import java.beans.Introspector; import java.beans.PropertyDescriptor; diff --git a/core/src/main/java/org/apache/struts2/interceptor/httpmethod/HttpMethodInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/httpmethod/HttpMethodInterceptor.java index c0afca1c3..c3af55513 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/httpmethod/HttpMethodInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/httpmethod/HttpMethodInterceptor.java @@ -24,7 +24,7 @@ import com.opensymphony.xwork2.util.AnnotationUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Method; diff --git a/core/src/main/java/org/apache/struts2/interceptor/servlet/ServletPrincipalProxy.java b/core/src/main/java/org/apache/struts2/interceptor/servlet/ServletPrincipalProxy.java index 5a611b0b3..5f136b57f 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/servlet/ServletPrincipalProxy.java +++ b/core/src/main/java/org/apache/struts2/interceptor/servlet/ServletPrincipalProxy.java @@ -20,7 +20,7 @@ package org.apache.struts2.interceptor.servlet; import org.apache.struts2.interceptor.PrincipalProxy; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.security.Principal; /** diff --git a/core/src/main/java/org/apache/struts2/result/HttpHeaderResult.java b/core/src/main/java/org/apache/struts2/result/HttpHeaderResult.java index a5d63b74a..0a7b3af39 100644 --- a/core/src/main/java/org/apache/struts2/result/HttpHeaderResult.java +++ b/core/src/main/java/org/apache/struts2/result/HttpHeaderResult.java @@ -27,7 +27,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.ServletActionContext; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/result/PlainResult.java b/core/src/main/java/org/apache/struts2/result/PlainResult.java index 172f6b6d7..fba2cc2e7 100644 --- a/core/src/main/java/org/apache/struts2/result/PlainResult.java +++ b/core/src/main/java/org/apache/struts2/result/PlainResult.java @@ -27,8 +27,8 @@ import org.apache.struts2.StrutsException; import org.apache.struts2.result.plain.HttpHeader; import org.apache.struts2.result.plain.ResponseBuilder; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; /** * This result can only be used in code, as a result of action's method, eg.: diff --git a/core/src/main/java/org/apache/struts2/result/PlainTextResult.java b/core/src/main/java/org/apache/struts2/result/PlainTextResult.java index 7baaa055c..f5ba127b1 100644 --- a/core/src/main/java/org/apache/struts2/result/PlainTextResult.java +++ b/core/src/main/java/org/apache/struts2/result/PlainTextResult.java @@ -22,8 +22,8 @@ import com.opensymphony.xwork2.ActionInvocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/core/src/main/java/org/apache/struts2/result/PostbackResult.java b/core/src/main/java/org/apache/struts2/result/PostbackResult.java index 96015e8fd..626eb0bca 100644 --- a/core/src/main/java/org/apache/struts2/result/PostbackResult.java +++ b/core/src/main/java/org/apache/struts2/result/PostbackResult.java @@ -24,8 +24,8 @@ import com.opensymphony.xwork2.inject.Inject; import org.apache.struts2.dispatcher.mapper.ActionMapper; import org.apache.struts2.dispatcher.mapper.ActionMapping; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.PrintWriter; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java b/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java index d863a890b..89506ab84 100644 --- a/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java +++ b/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java @@ -29,10 +29,10 @@ import org.apache.struts2.StrutsStatics; import org.apache.struts2.dispatcher.HttpParameters; import org.apache.struts2.url.QueryStringParser; -import javax.servlet.RequestDispatcher; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.PageContext; /** * diff --git a/core/src/main/java/org/apache/struts2/result/ServletRedirectResult.java b/core/src/main/java/org/apache/struts2/result/ServletRedirectResult.java index 00d5b5203..c0e7390bd 100644 --- a/core/src/main/java/org/apache/struts2/result/ServletRedirectResult.java +++ b/core/src/main/java/org/apache/struts2/result/ServletRedirectResult.java @@ -31,8 +31,8 @@ import org.apache.struts2.dispatcher.mapper.ActionMapper; import org.apache.struts2.dispatcher.mapper.ActionMapping; import org.apache.struts2.url.QueryStringBuilder; -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.net.MalformedURLException; import java.net.URI; @@ -43,7 +43,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import static javax.servlet.http.HttpServletResponse.SC_FOUND; +import static jakarta.servlet.http.HttpServletResponse.SC_FOUND; /** * Calls the {@link HttpServletResponse#sendRedirect(String) sendRedirect} diff --git a/core/src/main/java/org/apache/struts2/result/StreamResult.java b/core/src/main/java/org/apache/struts2/result/StreamResult.java index 9324d5bb5..fcbb1429d 100644 --- a/core/src/main/java/org/apache/struts2/result/StreamResult.java +++ b/core/src/main/java/org/apache/struts2/result/StreamResult.java @@ -24,7 +24,7 @@ import com.opensymphony.xwork2.security.NotExcludedAcceptedPatternsChecker; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.InputStream; import java.io.OutputStream; diff --git a/core/src/main/java/org/apache/struts2/result/plain/HttpCookies.java b/core/src/main/java/org/apache/struts2/result/plain/HttpCookies.java index 22c105b7f..30bc2ff1d 100644 --- a/core/src/main/java/org/apache/struts2/result/plain/HttpCookies.java +++ b/core/src/main/java/org/apache/struts2/result/plain/HttpCookies.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.result.plain; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/core/src/main/java/org/apache/struts2/result/plain/ResponseBuilder.java b/core/src/main/java/org/apache/struts2/result/plain/ResponseBuilder.java index 5e1ae202b..b5004f50d 100644 --- a/core/src/main/java/org/apache/struts2/result/plain/ResponseBuilder.java +++ b/core/src/main/java/org/apache/struts2/result/plain/ResponseBuilder.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.result.plain; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; public class ResponseBuilder { diff --git a/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java b/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java index 6c593fd2f..bf8cf2595 100644 --- a/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java +++ b/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java @@ -21,7 +21,7 @@ package org.apache.struts2.util; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspWriter; import java.io.*; import java.nio.ByteBuffer; import java.nio.CharBuffer; diff --git a/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java b/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java index 42e107f40..b7d39bfcf 100644 --- a/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java +++ b/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java @@ -25,9 +25,9 @@ import com.opensymphony.xwork2.util.ValueStackFactory; import org.apache.struts2.dispatcher.Dispatcher; import org.apache.struts2.dispatcher.DispatcherErrorHandler; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/util/StrutsUtil.java b/core/src/main/java/org/apache/struts2/util/StrutsUtil.java index c693599e7..234c492de 100644 --- a/core/src/main/java/org/apache/struts2/util/StrutsUtil.java +++ b/core/src/main/java/org/apache/struts2/util/StrutsUtil.java @@ -27,12 +27,12 @@ import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsException; import org.apache.struts2.views.util.UrlHelper; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletOutputStream; -import javax.servlet.WriteListener; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.WriteListener; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/core/src/main/java/org/apache/struts2/util/URLBean.java b/core/src/main/java/org/apache/struts2/util/URLBean.java index 8832b4c0e..7b0c21d76 100644 --- a/core/src/main/java/org/apache/struts2/util/URLBean.java +++ b/core/src/main/java/org/apache/struts2/util/URLBean.java @@ -22,8 +22,8 @@ import com.opensymphony.xwork2.ActionContext; import org.apache.struts2.views.util.DefaultUrlHelper; import org.apache.struts2.views.util.UrlHelper; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java b/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java index cab6c4018..f047b09d5 100644 --- a/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java +++ b/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java @@ -21,8 +21,8 @@ package org.apache.struts2.views; import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.views.freemarker.tags.StrutsModels; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * The default Struts tag library diff --git a/core/src/main/java/org/apache/struts2/views/JspSupportServlet.java b/core/src/main/java/org/apache/struts2/views/JspSupportServlet.java index 1848791d3..f126d1bf4 100644 --- a/core/src/main/java/org/apache/struts2/views/JspSupportServlet.java +++ b/core/src/main/java/org/apache/struts2/views/JspSupportServlet.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.views; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; /** */ diff --git a/core/src/main/java/org/apache/struts2/views/TagLibraryDirectiveProvider.java b/core/src/main/java/org/apache/struts2/views/TagLibraryDirectiveProvider.java index ccc8e4b38..9bbfc6741 100644 --- a/core/src/main/java/org/apache/struts2/views/TagLibraryDirectiveProvider.java +++ b/core/src/main/java/org/apache/struts2/views/TagLibraryDirectiveProvider.java @@ -20,8 +20,8 @@ package org.apache.struts2.views; import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/views/TagLibraryModelProvider.java b/core/src/main/java/org/apache/struts2/views/TagLibraryModelProvider.java index 0aae04400..bf97e9486 100644 --- a/core/src/main/java/org/apache/struts2/views/TagLibraryModelProvider.java +++ b/core/src/main/java/org/apache/struts2/views/TagLibraryModelProvider.java @@ -20,8 +20,8 @@ package org.apache.struts2.views; import com.opensymphony.xwork2.util.ValueStack; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Provides Freemarker implementation classes for a tag library diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java index 62c7cc9ae..fdb0fc593 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java @@ -50,11 +50,11 @@ import org.apache.struts2.views.JspSupportServlet; import org.apache.struts2.views.TagLibraryModelProvider; import org.apache.struts2.views.util.ContextUtil; -import javax.servlet.GenericServlet; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.GenericServlet; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.File; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java index 4b7fd4bc0..80adddac9 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java @@ -36,9 +36,9 @@ import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsStatics; import org.apache.struts2.result.StrutsResultSupport; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.CharArrayWriter; import java.io.IOException; import java.io.Writer; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java index 441566670..edfc991bc 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java @@ -24,9 +24,9 @@ import freemarker.template.SimpleHash; import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java index 25596ab20..41c1a7bcb 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.ActionError; import org.apache.struts2.components.Component; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java index 2af404faf..ad92faef5 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.ActionMessage; import org.apache.struts2.components.Component; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java index 2e2663c21..788a09944 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.ActionComponent; import org.apache.struts2.components.Component; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java index f1011282e..c74165fd8 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Anchor; import org.apache.struts2.components.Component; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java index 8c88fb475..24a00bf20 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Bean; import org.apache.struts2.components.Component; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java index 9dbac7eb1..60d0e7168 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.CheckboxList; import org.apache.struts2.components.Component; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxModel.java index 1ed6056ae..b287fbee9 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Checkbox; import org.apache.struts2.components.Component; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComboBoxModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComboBoxModel.java index e188146a4..bb128306d 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComboBoxModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComboBoxModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.ComboBox; import org.apache.struts2.components.Component; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComponentModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComponentModel.java index 7475c2295..7272ab205 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComponentModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComponentModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.GenericUIBean; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/DateModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/DateModel.java index dd0a7a55b..083fd7a17 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/DateModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/DateModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Date; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/DoubleSelectModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/DoubleSelectModel.java index 11102ceb1..66c8853e7 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/DoubleSelectModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/DoubleSelectModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.DoubleSelect; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseIfModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseIfModel.java index e6684ba3b..a56cef2be 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseIfModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseIfModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.ElseIf; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseModel.java index 64163d561..57b5e9760 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Else; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/FieldErrorModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/FieldErrorModel.java index 7f8b230f0..1b4c2416e 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/FieldErrorModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/FieldErrorModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.FieldError; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/FileModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/FileModel.java index 4d3be2258..eab2c23cb 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/FileModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/FileModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.File; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/FormModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/FormModel.java index abc23e186..273a1862a 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/FormModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/FormModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Form; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/HeadModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/HeadModel.java index d99733477..baa27c65a 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/HeadModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/HeadModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Head; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/HiddenModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/HiddenModel.java index 5a182e001..136fd787d 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/HiddenModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/HiddenModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Hidden; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/I18nModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/I18nModel.java index a35bc9e60..f6bc66fd9 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/I18nModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/I18nModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.I18n; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/IfModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/IfModel.java index 6d5c3269d..bf05ba86e 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/IfModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/IfModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.If; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/IncludeModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/IncludeModel.java index 847f26fc3..25b9c8028 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/IncludeModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/IncludeModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Include; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/InputTransferSelectModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/InputTransferSelectModel.java index 3c7123533..ecb3c066a 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/InputTransferSelectModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/InputTransferSelectModel.java @@ -20,8 +20,8 @@ package org.apache.struts2.views.freemarker.tags; import com.opensymphony.xwork2.util.ValueStack; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.InputTransferSelect; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/IteratorModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/IteratorModel.java index ac8de2585..941db88a2 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/IteratorModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/IteratorModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.IteratorComponent; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/LabelModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/LabelModel.java index a41bbc693..00db2572d 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/LabelModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/LabelModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Label; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/LinkModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/LinkModel.java index f3fa7f516..12bf202cf 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/LinkModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/LinkModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Link; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptGroupModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptGroupModel.java index 7c6035ff8..82a2d4510 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptGroupModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptGroupModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.OptGroup; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptionTransferSelectModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptionTransferSelectModel.java index 53570e332..7249410cf 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptionTransferSelectModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptionTransferSelectModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.OptionTransferSelect; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ParamModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ParamModel.java index 90f977e1d..a5ed505f8 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ParamModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ParamModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Param; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/PasswordModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/PasswordModel.java index 881459f39..bb1ab11c5 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/PasswordModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/PasswordModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Password; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/PropertyModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/PropertyModel.java index d6595147c..dec548367 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/PropertyModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/PropertyModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Property; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/PushModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/PushModel.java index ed2916460..857852238 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/PushModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/PushModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Push; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/RadioModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/RadioModel.java index c38ae82b9..5ac983076 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/RadioModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/RadioModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Radio; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ResetModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ResetModel.java index 09ca5b237..472940a94 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ResetModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ResetModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Reset; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ScriptModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ScriptModel.java index c2a84f3c8..576ce208b 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ScriptModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ScriptModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Script; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/SelectModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/SelectModel.java index c607f7750..f8afb38ec 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/SelectModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/SelectModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Select; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java index 2ab73599a..bb07a0989 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Set; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java index 819ba9556..f03486c66 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.components.Script; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java index 5cd53d849..c28f0ecda 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Submit; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java index 112457485..d2427d615 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java @@ -31,8 +31,8 @@ import freemarker.template.TemplateModelException; import freemarker.template.TemplateTransformModel; import org.apache.struts2.components.Component; -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.io.Writer; import java.util.HashMap; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java index 73c2edc05..2c3346d55 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.TextArea; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java index 5c9e08768..61208d3ba 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.TextField; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java index 376f7116f..bd1a8b0ef 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Text; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java index 4ae87f339..fd01b7ba3 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Token; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java index 9b3c2f4cc..312261df1 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.URL; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java index bc9ac210d..85d399f36 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.freemarker.tags; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.UpDownSelect; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java index 7478a1258..4c6fba4e8 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java @@ -22,8 +22,8 @@ import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.components.ActionComponent; import org.apache.struts2.components.Component; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @see ActionComponent diff --git a/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java b/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java index 363078be3..7fb5f9700 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Bean; import org.apache.struts2.components.Component; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java b/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java index 73bba2ea6..7ef4eed1e 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.views.jsp; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.JspException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.JspException; import com.opensymphony.xwork2.ActionContext; import org.apache.struts2.components.Component; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java b/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java index 70681cf98..0883ec296 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java @@ -22,8 +22,8 @@ import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.components.Component; import org.apache.struts2.components.Date; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @see Date diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java index 659a6cd23..8a2dea522 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.ElseIf; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java index 343105a83..2d918021a 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Else; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java b/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java index 14b46b7fc..ee596bef9 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.I18n; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java b/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java index 7621656c2..d8a9a1cf1 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.If; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java b/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java index 6ebee945a..4c92b0b3a 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Include; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java index f85875c32..7fd6fc768 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java @@ -22,9 +22,9 @@ import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.components.Component; import org.apache.struts2.components.IteratorComponent; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.JspException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.JspException; /** * @see IteratorComponent diff --git a/core/src/main/java/org/apache/struts2/views/jsp/NumberTag.java b/core/src/main/java/org/apache/struts2/views/jsp/NumberTag.java index 45262c63c..bbed50ffa 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/NumberTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/NumberTag.java @@ -22,8 +22,8 @@ import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.components.Component; import org.apache.struts2.components.Number; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @see Number diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java index 019059367..2e5f263c5 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java @@ -22,8 +22,8 @@ import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.components.Component; import org.apache.struts2.components.Param; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @see Param diff --git a/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java b/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java index 7db42fcf8..8aed2ece6 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Property; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java b/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java index f6d647dd3..e184eadce 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Push; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java b/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java index c76f41cb0..5dab7b198 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Set; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java b/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java index 0fd430c58..5d5fe5755 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java @@ -23,8 +23,8 @@ import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.util.ComponentUtils; import org.apache.struts2.util.FastByteArrayOutputStream; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.BodyTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.BodyTagSupport; import java.io.PrintWriter; /** diff --git a/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java b/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java index 044f5d1af..50fdad193 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java @@ -26,8 +26,8 @@ import org.apache.logging.log4j.Logger; import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.AttributeMap; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.jsp.PageContext; public class TagUtils { diff --git a/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java b/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java index 812c81baa..257bd760c 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Text; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java b/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java index 445777a49..eb57e5597 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.URL; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java index 1ea16506d..b85990ff4 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.iterator; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.AppendIterator; import org.apache.struts2.components.Component; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java index f3af5f628..b659566d1 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java @@ -26,7 +26,7 @@ import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.views.jsp.StrutsBodyTagSupport; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspException; /** * diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java index 839030ca4..e91477487 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.iterator; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.MergeIterator; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java index 32e13924f..e3cd51518 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java @@ -20,7 +20,7 @@ package org.apache.struts2.views.jsp.iterator; import java.util.Comparator; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspException; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java index f269a945d..ffff03886 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java @@ -26,7 +26,7 @@ import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.views.jsp.StrutsBodyTagSupport; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspException; /** * diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java index cb2b0b075..aecf265e6 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java @@ -21,8 +21,8 @@ package org.apache.struts2.views.jsp.ui; import org.apache.struts2.components.UIBean; import org.apache.struts2.views.jsp.ComponentTagSupport; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.DynamicAttributes; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.DynamicAttributes; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionErrorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionErrorTag.java index 02f564c54..f2f09b489 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionErrorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionErrorTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.ActionError; import org.apache.struts2.components.Component; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionMessageTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionMessageTag.java index 4ce77bc6c..55d04b099 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionMessageTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionMessageTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.ActionMessage; import org.apache.struts2.components.Component; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java index 12482ab02..3cd89024d 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java @@ -23,8 +23,8 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.struts2.components.Anchor; import org.apache.struts2.components.Component; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @see Anchor diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxListTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxListTag.java index 2e63b3c62..322752d5f 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxListTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxListTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.CheckboxList; import org.apache.struts2.components.Component; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java index 242aa033b..9d74d2c52 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java @@ -22,8 +22,8 @@ import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.components.Checkbox; import org.apache.struts2.components.Component; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @see Checkbox diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/ComboBoxTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/ComboBoxTag.java index 29c03a276..64e2cb8c2 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/ComboBoxTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/ComboBoxTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.ComboBox; import org.apache.struts2.components.Component; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/ComponentTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/ComponentTag.java index 48a62d457..d710d5d1d 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/ComponentTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/ComponentTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.GenericUIBean; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/DateTextFieldTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/DateTextFieldTag.java index 768864065..d5a014327 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/DateTextFieldTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/DateTextFieldTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.DateTextField; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java index c96d53096..ba8f56100 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Debug; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/DoubleSelectTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/DoubleSelectTag.java index ee430c9e5..7bd0c6400 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/DoubleSelectTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/DoubleSelectTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.DoubleSelect; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/FieldErrorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/FieldErrorTag.java index 1d7a6e363..07624c3d5 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/FieldErrorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/FieldErrorTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.FieldError; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/FileTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/FileTag.java index ef5171d0d..aa61d4670 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/FileTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/FileTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.File; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java index e765bb569..f6d260aeb 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Form; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java index b5a457eed..eaa049285 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Head; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/HiddenTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/HiddenTag.java index 65f7e49d1..550b30d1b 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/HiddenTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/HiddenTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Hidden; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/InputTransferSelectTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/InputTransferSelectTag.java index 4dbf0070d..ac583ad91 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/InputTransferSelectTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/InputTransferSelectTag.java @@ -22,8 +22,8 @@ import org.apache.struts2.components.Component; import org.apache.struts2.components.InputTransferSelect; import com.opensymphony.xwork2.util.ValueStack; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * InputTransferSelect jsp tag. diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/LabelTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/LabelTag.java index b62e50d61..6e64205be 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/LabelTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/LabelTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Label; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/LinkTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/LinkTag.java index 4d4aaac40..d3f930adb 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/LinkTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/LinkTag.java @@ -23,8 +23,8 @@ import org.apache.struts2.components.Component; import org.apache.struts2.components.Link; import org.apache.struts2.components.Script; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @see Link diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/OptGroupTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/OptGroupTag.java index 83b6a9de5..4652d2205 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/OptGroupTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/OptGroupTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.OptGroup; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java index 7ad259974..59d7260ad 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.OptionTransferSelect; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/PasswordTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/PasswordTag.java index 8732135fb..a0db851da 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/PasswordTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/PasswordTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Password; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/RadioTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/RadioTag.java index a5f4ab1ac..a1a65a0e4 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/RadioTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/RadioTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Radio; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java index e623eef7b..6933a2f2c 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java @@ -22,8 +22,8 @@ import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.components.Component; import org.apache.struts2.components.Reset; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @see org.apache.struts2.components.Reset diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/ScriptTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/ScriptTag.java index 40ca19e8c..ef2b1ef80 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/ScriptTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/ScriptTag.java @@ -23,8 +23,8 @@ import org.apache.struts2.components.Component; import org.apache.struts2.components.Form; import org.apache.struts2.components.Script; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @see Script diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/SelectTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/SelectTag.java index 7659f53a2..e279d00ac 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/SelectTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/SelectTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Select; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java index 6f77e92b9..4c1c942c2 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Submit; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java index a3325a454..f5ef533b8 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java @@ -22,8 +22,8 @@ import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.components.Component; import org.apache.struts2.components.TextField; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @see TextField diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java index b814eb115..fcb6fd8a4 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.TextArea; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java index 806116c79..bc9e79432 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Token; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java index 4713c5cf1..88188c84c 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.UpDownSelect; diff --git a/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java b/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java index 0f1c85aae..1468703aa 100644 --- a/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java +++ b/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java @@ -23,8 +23,8 @@ import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.dispatcher.DispatcherConstants; import org.apache.struts2.util.StrutsUtil; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java b/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java index 6cf82c7d9..d0e97bceb 100644 --- a/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java +++ b/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java @@ -26,8 +26,8 @@ import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsConstants; import org.apache.struts2.url.QueryStringBuilder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Map; /** diff --git a/core/src/main/java/org/apache/struts2/views/util/ResourceUtil.java b/core/src/main/java/org/apache/struts2/views/util/ResourceUtil.java index 52cb3ba31..5ad831b2d 100644 --- a/core/src/main/java/org/apache/struts2/views/util/ResourceUtil.java +++ b/core/src/main/java/org/apache/struts2/views/util/ResourceUtil.java @@ -19,7 +19,7 @@ package org.apache.struts2.views.util; import org.apache.struts2.RequestUtils; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public class ResourceUtil { public static String getResourceBase(HttpServletRequest req) { diff --git a/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java b/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java index 712243ed6..9babbb145 100644 --- a/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java +++ b/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.util; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Map; /** diff --git a/core/src/test/java/org/apache/struts2/RequestUtilsTest.java b/core/src/test/java/org/apache/struts2/RequestUtilsTest.java index e7d7437bc..d51a55d06 100644 --- a/core/src/test/java/org/apache/struts2/RequestUtilsTest.java +++ b/core/src/test/java/org/apache/struts2/RequestUtilsTest.java @@ -25,7 +25,7 @@ package org.apache.struts2; import junit.framework.TestCase; import static org.easymock.EasyMock.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Date; public class RequestUtilsTest extends TestCase { diff --git a/core/src/test/java/org/apache/struts2/ServletActionContextTest.java b/core/src/test/java/org/apache/struts2/ServletActionContextTest.java index 2148b1c0d..8549a14ea 100644 --- a/core/src/test/java/org/apache/struts2/ServletActionContextTest.java +++ b/core/src/test/java/org/apache/struts2/ServletActionContextTest.java @@ -24,8 +24,8 @@ import com.mockobjects.servlet.MockServletContext; import com.opensymphony.xwork2.ActionContext; import junit.framework.TestCase; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.Map; diff --git a/core/src/test/java/org/apache/struts2/components/ComponentTest.java b/core/src/test/java/org/apache/struts2/components/ComponentTest.java index 762e37ae3..e01f7d89e 100644 --- a/core/src/test/java/org/apache/struts2/components/ComponentTest.java +++ b/core/src/test/java/org/apache/struts2/components/ComponentTest.java @@ -39,7 +39,7 @@ import org.apache.struts2.views.jsp.iterator.MergeIteratorTag; import org.apache.struts2.views.jsp.ui.TextFieldTag; import org.apache.struts2.views.jsp.ui.UpDownSelectTag; -import javax.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.tagext.TagSupport; import java.util.HashMap; import java.util.Iterator; import java.util.Locale; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/ApplicationMapTest.java b/core/src/test/java/org/apache/struts2/dispatcher/ApplicationMapTest.java index ee44674b9..bba9045da 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/ApplicationMapTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/ApplicationMapTest.java @@ -21,7 +21,7 @@ package org.apache.struts2.dispatcher; import org.junit.Test; import org.springframework.mock.web.MockServletContext; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/DefaultDispatcherErrorHandlerTest.java b/core/src/test/java/org/apache/struts2/dispatcher/DefaultDispatcherErrorHandlerTest.java index e89dd3913..76b4d28c9 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/DefaultDispatcherErrorHandlerTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/DefaultDispatcherErrorHandlerTest.java @@ -22,8 +22,8 @@ import java.io.IOException; import java.util.Collections; import org.apache.struts2.StrutsInternalTestCase; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.views.freemarker.FreemarkerManager; import static org.easymock.EasyMock.anyInt; import static org.easymock.EasyMock.anyString; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/DefaultStaticContentLoaderTest.java b/core/src/test/java/org/apache/struts2/dispatcher/DefaultStaticContentLoaderTest.java index b472ce5c9..db5caba14 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/DefaultStaticContentLoaderTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/DefaultStaticContentLoaderTest.java @@ -22,8 +22,8 @@ import java.io.IOException; import org.apache.struts2.StrutsInternalTestCase; import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expectLastCall; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java b/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java index 73a526535..03aa83e02 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java @@ -44,8 +44,8 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpSession; import org.springframework.mock.web.MockServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/NullActionMapper.java b/core/src/test/java/org/apache/struts2/dispatcher/NullActionMapper.java index 5e96b7596..ad3738cd2 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/NullActionMapper.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/NullActionMapper.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.dispatcher; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.struts2.dispatcher.mapper.ActionMapper; import org.apache.struts2.dispatcher.mapper.ActionMapping; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/PrepareOperationsTest.java b/core/src/test/java/org/apache/struts2/dispatcher/PrepareOperationsTest.java index 76fee5579..bc8470206 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/PrepareOperationsTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/PrepareOperationsTest.java @@ -24,8 +24,8 @@ import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsInternalTestCase; import org.springframework.mock.web.MockHttpServletRequest; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; import java.util.stream.IntStream; public class PrepareOperationsTest extends StrutsInternalTestCase { diff --git a/core/src/test/java/org/apache/struts2/dispatcher/RequestMapTest.java b/core/src/test/java/org/apache/struts2/dispatcher/RequestMapTest.java index 91ccbd842..e89897f90 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/RequestMapTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/RequestMapTest.java @@ -21,7 +21,7 @@ package org.apache.struts2.dispatcher; import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/SessionMapTest.java b/core/src/test/java/org/apache/struts2/dispatcher/SessionMapTest.java index 6dc597ebd..b15f8a308 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/SessionMapTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/SessionMapTest.java @@ -25,8 +25,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import org.springframework.mock.web.MockHttpServletRequest; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/StaticContentLoaderTest.java b/core/src/test/java/org/apache/struts2/dispatcher/StaticContentLoaderTest.java index fbcf4e62b..fbf2a044a 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/StaticContentLoaderTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/StaticContentLoaderTest.java @@ -20,7 +20,7 @@ package org.apache.struts2.dispatcher; import java.io.IOException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import junit.framework.TestCase; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/StrutsPrepareAndExecuteFilterIntegrationTest.java b/core/src/test/java/org/apache/struts2/dispatcher/StrutsPrepareAndExecuteFilterIntegrationTest.java index eb87235e1..cc434571c 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/StrutsPrepareAndExecuteFilterIntegrationTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/StrutsPrepareAndExecuteFilterIntegrationTest.java @@ -26,10 +26,10 @@ import org.springframework.mock.web.MockFilterConfig; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import java.io.IOException; import java.util.ArrayList; import java.util.regex.Pattern; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/TwoFilterIntegrationTest.java b/core/src/test/java/org/apache/struts2/dispatcher/TwoFilterIntegrationTest.java index 65d2dfaea..36a07e3d4 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/TwoFilterIntegrationTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/TwoFilterIntegrationTest.java @@ -28,12 +28,12 @@ import org.springframework.mock.web.MockFilterConfig; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -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 jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import java.io.IOException; import java.util.Arrays; import java.util.LinkedList; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapperTest.java b/core/src/test/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapperTest.java index 8548bf050..570fe7bcd 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapperTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapperTest.java @@ -25,7 +25,7 @@ import com.opensymphony.xwork2.inject.Container; import junit.framework.TestCase; import org.springframework.mock.web.MockHttpServletRequest; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * diff --git a/core/src/test/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequestTest.java b/core/src/test/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequestTest.java index 59861e2ed..7f9ba532f 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequestTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequestTest.java @@ -25,7 +25,7 @@ import org.junit.Test; import org.mockito.Mockito; import org.springframework.mock.web.DelegatingServletInputStream; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.ByteArrayInputStream; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java index afe18f731..86bbfe798 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java @@ -29,7 +29,7 @@ import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsInternalTestCase; import org.springframework.mock.web.MockHttpServletRequest; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import java.util.Collections; import java.util.HashMap; import java.util.Map; diff --git a/core/src/test/java/org/apache/struts2/interceptor/CookieProviderInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/CookieProviderInterceptorTest.java index 98be81aea..421cdca68 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/CookieProviderInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/CookieProviderInterceptorTest.java @@ -22,8 +22,8 @@ import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.XWorkTestCase; import org.easymock.EasyMock; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; import java.util.HashSet; import java.util.Set; diff --git a/core/src/test/java/org/apache/struts2/interceptor/CreateSessionInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/CreateSessionInterceptorTest.java index 3a887c224..2690adaf3 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/CreateSessionInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/CreateSessionInterceptorTest.java @@ -26,7 +26,7 @@ import org.jmock.Mock; import org.jmock.core.constraint.IsEqual; import org.jmock.core.matcher.InvokeOnceMatcher; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Test case for CreateSessionInterceptor. diff --git a/core/src/test/java/org/apache/struts2/interceptor/CspInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/CspInterceptorTest.java index 2811b289f..c382a6104 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/CspInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/CspInterceptorTest.java @@ -30,7 +30,7 @@ import org.apache.struts2.interceptor.csp.DefaultCspSettings; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import static org.junit.Assert.assertNotEquals; diff --git a/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java index 87595d9b5..8e94382fa 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java @@ -42,7 +42,7 @@ import org.apache.struts2.interceptor.exec.ExecutorProvider; import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest; import org.apache.struts2.views.jsp.StrutsMockHttpSession; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; diff --git a/core/src/test/java/org/apache/struts2/interceptor/FetchMetadataInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/FetchMetadataInterceptorTest.java index 6426ebeaa..afbe7be46 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/FetchMetadataInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/FetchMetadataInterceptorTest.java @@ -33,7 +33,7 @@ import org.apache.struts2.config.StrutsXmlConfigurationProvider; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.Collection; import java.util.Iterator; diff --git a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java index 14bb23c36..573e73df6 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java @@ -35,7 +35,7 @@ import org.apache.struts2.dispatcher.multipart.StrutsUploadedFile; import org.apache.struts2.dispatcher.multipart.UploadedFile; import org.springframework.mock.web.MockHttpServletRequest; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.File; import java.io.IOException; import java.net.URI; diff --git a/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java index a8fd8420f..8a14230fe 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java @@ -33,8 +33,8 @@ import org.easymock.IArgumentMatcher; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpSession; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; import java.io.Serializable; import java.util.Arrays; import java.util.HashMap; diff --git a/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java index e451f59cd..6abcd89c5 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java @@ -27,9 +27,9 @@ import org.apache.struts2.StrutsInternalTestCase; import org.apache.struts2.dispatcher.HttpParameters; import org.easymock.EasyMock; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java b/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java index 9fdcf3e27..50d46ebd1 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java @@ -31,9 +31,9 @@ import org.apache.struts2.dispatcher.HttpParameters; import org.apache.struts2.result.ServletRedirectResult; import org.easymock.EasyMock; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; diff --git a/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java index 7c3624e42..d6d47910a 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java @@ -30,8 +30,8 @@ import org.apache.struts2.util.TokenHelper; import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest; import org.apache.struts2.views.jsp.StrutsMockHttpSession; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import java.util.Map; import java.util.TreeMap; diff --git a/core/src/test/java/org/apache/struts2/result/HttpHeaderResultTest.java b/core/src/test/java/org/apache/struts2/result/HttpHeaderResultTest.java index 61a8f86f5..445aaf278 100644 --- a/core/src/test/java/org/apache/struts2/result/HttpHeaderResultTest.java +++ b/core/src/test/java/org/apache/struts2/result/HttpHeaderResultTest.java @@ -26,7 +26,7 @@ import com.opensymphony.xwork2.util.reflection.ReflectionProvider; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsInternalTestCase; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.Map; diff --git a/core/src/test/java/org/apache/struts2/result/ServletDispatcherResultTest.java b/core/src/test/java/org/apache/struts2/result/ServletDispatcherResultTest.java index 0f57593d6..bc979a820 100644 --- a/core/src/test/java/org/apache/struts2/result/ServletDispatcherResultTest.java +++ b/core/src/test/java/org/apache/struts2/result/ServletDispatcherResultTest.java @@ -28,9 +28,9 @@ import org.apache.struts2.StrutsInternalTestCase; import org.apache.struts2.StrutsStatics; import org.apache.struts2.dispatcher.HttpParameters; -import javax.servlet.RequestDispatcher; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class ServletDispatcherResultTest extends StrutsInternalTestCase implements StrutsStatics { diff --git a/core/src/test/java/org/apache/struts2/result/ServletRedirectResultTest.java b/core/src/test/java/org/apache/struts2/result/ServletRedirectResultTest.java index e8746aa8d..8f596bbdf 100644 --- a/core/src/test/java/org/apache/struts2/result/ServletRedirectResultTest.java +++ b/core/src/test/java/org/apache/struts2/result/ServletRedirectResultTest.java @@ -38,8 +38,8 @@ import org.easymock.IMocksControl; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -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.io.PrintWriter; import java.io.StringWriter; @@ -48,7 +48,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static javax.servlet.http.HttpServletResponse.SC_SEE_OTHER; +import static jakarta.servlet.http.HttpServletResponse.SC_SEE_OTHER; import static org.easymock.EasyMock.createControl; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.createNiceMock; diff --git a/core/src/test/java/org/apache/struts2/util/SecurityMemberAccessInServletsTest.java b/core/src/test/java/org/apache/struts2/util/SecurityMemberAccessInServletsTest.java index e67ef535e..de9b328a3 100644 --- a/core/src/test/java/org/apache/struts2/util/SecurityMemberAccessInServletsTest.java +++ b/core/src/test/java/org/apache/struts2/util/SecurityMemberAccessInServletsTest.java @@ -22,7 +22,7 @@ import com.opensymphony.xwork2.ognl.SecurityMemberAccess; import org.apache.struts2.StrutsInternalTestCase; import org.apache.struts2.views.jsp.ActionTag; -import javax.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.tagext.TagSupport; import java.lang.reflect.Member; import java.util.HashMap; import java.util.Map; diff --git a/core/src/test/java/org/apache/struts2/util/StrutsUtilTest.java b/core/src/test/java/org/apache/struts2/util/StrutsUtilTest.java index bd1de3313..0080ed527 100644 --- a/core/src/test/java/org/apache/struts2/util/StrutsUtilTest.java +++ b/core/src/test/java/org/apache/struts2/util/StrutsUtilTest.java @@ -26,9 +26,9 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockRequestDispatcher; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import java.util.Arrays; import java.util.LinkedHashMap; import java.util.List; diff --git a/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java b/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java index 2eefd7228..f582b76e5 100644 --- a/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java +++ b/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java @@ -26,7 +26,7 @@ import org.apache.commons.io.FileUtils; import org.apache.struts2.StrutsInternalTestCase; import org.apache.struts2.views.jsp.StrutsMockServletContext; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.StringWriter; import java.io.Writer; import java.util.HashMap; diff --git a/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerResultMockedTest.java b/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerResultMockedTest.java index 7801c50b0..d4500cdb1 100644 --- a/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerResultMockedTest.java +++ b/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerResultMockedTest.java @@ -32,7 +32,7 @@ import org.apache.struts2.views.jsp.StrutsMockHttpServletResponse; import org.easymock.EasyMock; import org.springframework.mock.web.MockHttpServletRequest; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.File; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java index c1b8188fa..b77a92ec8 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java @@ -38,8 +38,8 @@ import org.apache.struts2.dispatcher.MockDispatcher; import org.apache.struts2.dispatcher.RequestMap; import org.apache.struts2.dispatcher.SessionMap; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.JspWriter; import java.io.File; import java.io.StringWriter; import java.util.HashMap; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java index 9678b600e..928daa6ce 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java @@ -34,8 +34,8 @@ import org.apache.struts2.dispatcher.HttpParameters; import org.apache.struts2.dispatcher.mapper.ActionMapper; import org.apache.struts2.dispatcher.mapper.DefaultActionMapper; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.PageContext; import java.util.HashMap; import java.util.Map; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/AnchorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/AnchorTagTest.java index ccc728945..7bf07bd68 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/AnchorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/AnchorTagTest.java @@ -21,8 +21,8 @@ package org.apache.struts2.views.jsp; import org.apache.struts2.views.jsp.ui.AnchorTag; import org.apache.struts2.views.jsp.ui.StrutsBodyContent; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; import java.io.StringWriter; import java.text.MessageFormat; import java.util.ArrayList; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/BeanTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/BeanTagTest.java index f6f9343f9..c73457cab 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/BeanTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/BeanTagTest.java @@ -21,7 +21,7 @@ package org.apache.struts2.views.jsp; import org.apache.struts2.StrutsException; import org.apache.struts2.dispatcher.HttpParameters; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspException; import java.util.HashMap; import java.util.Map; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/DynAttribsTest.java b/core/src/test/java/org/apache/struts2/views/jsp/DynAttribsTest.java index 1b33a582b..253203ff9 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/DynAttribsTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/DynAttribsTest.java @@ -21,7 +21,7 @@ package org.apache.struts2.views.jsp; import java.io.File; import java.net.URL; -import javax.servlet.jsp.tagext.DynamicAttributes; +import jakarta.servlet.jsp.tagext.DynamicAttributes; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java index 487377f7d..b4b3b2024 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.views.jsp; -import javax.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.tagext.TagSupport; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsInternalTestCase; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java index 4d7d7cfcb..f78a3d503 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.TagSupport; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsInternalTestCase; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/I18nTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/I18nTagTest.java index 46a5d4176..5da8ff6d6 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/I18nTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/I18nTagTest.java @@ -26,8 +26,8 @@ import com.mockobjects.servlet.MockJspWriter; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.ActionContext; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.TagSupport; public class I18nTagTest extends StrutsInternalTestCase { diff --git a/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java index 29813f8d1..a304699c8 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.jsp; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.TagSupport; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsInternalTestCase; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java index 85fe212b1..14a434032 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java @@ -20,9 +20,9 @@ package org.apache.struts2.views.jsp; import static org.easymock.EasyMock.*; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import org.apache.struts2.StrutsException; import org.apache.struts2.components.Include; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java index df5022c0a..360dade9b 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java @@ -22,8 +22,8 @@ import com.mockobjects.servlet.MockBodyContent; import com.mockobjects.servlet.MockJspWriter; import org.apache.commons.collections.ListUtils; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.TagSupport; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java index 621e7fb32..4fc208a00 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java @@ -25,7 +25,7 @@ import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsInternalTestCase; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspException; /** diff --git a/core/src/test/java/org/apache/struts2/views/jsp/PushTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/PushTagTest.java index 4da1b5ef1..4b026289f 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/PushTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/PushTagTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.views.jsp; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspException; /** diff --git a/core/src/test/java/org/apache/struts2/views/jsp/SetTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/SetTagTest.java index 9e5c30eb5..6e6bda2ee 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/SetTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/SetTagTest.java @@ -20,7 +20,7 @@ package org.apache.struts2.views.jsp; import com.mockobjects.servlet.MockJspWriter; import java.io.IOException; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspException; /** diff --git a/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java index f88c2ae81..51b8b7a81 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java @@ -23,7 +23,7 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspException; import org.apache.struts2.views.jsp.iterator.SortIteratorTag; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockBodyContent.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockBodyContent.java index 0c5b2c1d2..05305fda2 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockBodyContent.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockBodyContent.java @@ -22,8 +22,8 @@ import java.io.IOException; import java.io.Reader; import java.io.Writer; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.tagext.BodyContent; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.BodyContent; /** diff --git a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java index 7ae2172ce..8014bf131 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java @@ -25,8 +25,8 @@ import java.util.Locale; import java.util.Map; import java.util.Vector; -import javax.servlet.RequestDispatcher; -import javax.servlet.http.HttpSession; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpSession; import junit.framework.AssertionFailedError; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockJspWriter.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockJspWriter.java index 294497ffc..dc4a76046 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockJspWriter.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockJspWriter.java @@ -21,7 +21,7 @@ package org.apache.struts2.views.jsp; import java.io.IOException; import java.io.StringWriter; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspWriter; /** diff --git a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockPageContext.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockPageContext.java index b833ceb7d..b5e702d4b 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockPageContext.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockPageContext.java @@ -21,9 +21,9 @@ package org.apache.struts2.views.jsp; import java.util.HashMap; import java.util.Map; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import com.mockobjects.servlet.MockPageContext; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockServletContext.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockServletContext.java index c677acc14..dce16ceae 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockServletContext.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockServletContext.java @@ -28,16 +28,16 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.servlet.Filter; -import javax.servlet.FilterRegistration; -import javax.servlet.RequestDispatcher; -import javax.servlet.Servlet; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRegistration; -import javax.servlet.SessionCookieConfig; -import javax.servlet.SessionTrackingMode; -import javax.servlet.descriptor.JspConfigDescriptor; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterRegistration; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRegistration; +import jakarta.servlet.SessionCookieConfig; +import jakarta.servlet.SessionTrackingMode; +import jakarta.servlet.descriptor.JspConfigDescriptor; /** diff --git a/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java index c8e0f2488..71af4cbaa 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java @@ -30,8 +30,8 @@ import org.apache.struts2.components.Text; import org.apache.struts2.views.jsp.ui.StrutsBodyContent; import org.apache.struts2.views.jsp.ui.TestAction1; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.BodyTag; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.BodyTag; import java.text.MessageFormat; import java.util.ArrayList; import java.util.Date; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java index fc9fbe757..f231069e8 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java @@ -35,8 +35,8 @@ import org.apache.struts2.dispatcher.SessionMap; import org.apache.struts2.dispatcher.mapper.ActionMapping; import org.apache.struts2.dispatcher.mapper.DefaultActionMapper; -import javax.servlet.http.HttpSession; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.jsp.JspWriter; import java.io.File; import java.io.StringWriter; import java.util.ArrayList; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java index 137b3db21..b33e8dac7 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java @@ -30,7 +30,7 @@ import org.apache.struts2.StrutsConstants; import org.apache.struts2.TestAction; import org.apache.struts2.views.jsp.AbstractUITagTest; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Map; public class CheckboxTest extends AbstractUITagTest { diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java index f8897aea4..3c0365590 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java @@ -25,7 +25,7 @@ import org.apache.struts2.components.DateTextField; import org.apache.struts2.views.jsp.AbstractTagTest; import org.apache.struts2.views.jsp.DateTag; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspException; import java.text.DateFormat; import java.time.Instant; import java.time.LocalDate; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/JspTemplateTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/JspTemplateTest.java index f0d98ae1d..ec04a6262 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/JspTemplateTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/JspTemplateTest.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.RequestDispatcher; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.TestAction; import org.apache.struts2.views.jsp.AbstractUITagTest; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/LinkTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/LinkTagTest.java index ad5fca107..3f946bccd 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/LinkTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/LinkTagTest.java @@ -20,7 +20,7 @@ package org.apache.struts2.views.jsp.ui; import org.apache.struts2.views.jsp.AbstractUITagTest; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspException; public class LinkTagTest extends AbstractUITagTest { diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java index 90717b4d1..49b62038c 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java @@ -23,7 +23,7 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import javax.servlet.jsp.tagext.BodyTagSupport; +import jakarta.servlet.jsp.tagext.BodyTagSupport; /** diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/ScriptTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/ScriptTagTest.java index 2509fea29..929f4d9dc 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/ScriptTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/ScriptTagTest.java @@ -21,7 +21,7 @@ package org.apache.struts2.views.jsp.ui; import org.apache.struts2.views.jsp.AbstractUITagTest; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspException; public class ScriptTagTest extends AbstractUITagTest { diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java index 96b8fe660..6777613d8 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java @@ -23,8 +23,8 @@ import java.io.Reader; import java.io.StringReader; import java.io.Writer; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.tagext.BodyContent; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.BodyContent; /** diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java index d265eacfb..a6e632e1e 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.views.jsp.ui; -import javax.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspException; import org.apache.struts2.util.TokenHelper; import org.apache.struts2.views.jsp.AbstractUITagTest; diff --git a/core/src/test/java/org/apache/struts2/views/util/DefaultUrlHelperTest.java b/core/src/test/java/org/apache/struts2/views/util/DefaultUrlHelperTest.java index 9d1140a6a..14f6b536e 100644 --- a/core/src/test/java/org/apache/struts2/views/util/DefaultUrlHelperTest.java +++ b/core/src/test/java/org/apache/struts2/views/util/DefaultUrlHelperTest.java @@ -26,8 +26,8 @@ import org.apache.struts2.StrutsInternalTestCase; import org.apache.struts2.url.StrutsQueryStringBuilder; import org.apache.struts2.url.StrutsUrlEncoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.Map; import java.util.Set; diff --git a/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java b/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java index 6512fb8dc..8a60b82b0 100644 --- a/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java +++ b/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java @@ -21,7 +21,7 @@ package org.apache.struts2.views.util; * ResourceUtilTest * */ -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import junit.framework.TestCase; diff --git a/plugins/async/src/main/java/org/apache/struts2/async/DefaultAsyncManager.java b/plugins/async/src/main/java/org/apache/struts2/async/DefaultAsyncManager.java index 827783dd8..ed2f1c780 100644 --- a/plugins/async/src/main/java/org/apache/struts2/async/DefaultAsyncManager.java +++ b/plugins/async/src/main/java/org/apache/struts2/async/DefaultAsyncManager.java @@ -23,10 +23,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.ServletActionContext; -import javax.servlet.AsyncContext; -import javax.servlet.AsyncEvent; -import javax.servlet.AsyncListener; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.AsyncEvent; +import jakarta.servlet.AsyncListener; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.concurrent.Callable; import java.util.concurrent.Executor; diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml index 5609961a7..980d01c19 100644 --- a/plugins/bean-validation/pom.xml +++ b/plugins/bean-validation/pom.xml @@ -39,10 +39,11 @@ - javax.validation - validation-api - 2.0.1.Final + jakarta.validation + jakarta.validation-api + 3.0.2 + org.hibernate.validator @@ -52,7 +53,7 @@ org.glassfish - javax.el + jakarta.el test diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/FieldMatch.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/FieldMatch.java index 03d20b359..025e4730b 100644 --- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/FieldMatch.java +++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/FieldMatch.java @@ -20,8 +20,8 @@ package org.apache.struts.beanvalidation.constraints; import org.apache.struts.beanvalidation.constraints.impl.FieldMatchValidator; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/ValidationGroup.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/ValidationGroup.java index 19332288f..420065c4d 100644 --- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/ValidationGroup.java +++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/ValidationGroup.java @@ -18,7 +18,7 @@ */ package org.apache.struts.beanvalidation.constraints; -import javax.validation.groups.Default; +import jakarta.validation.groups.Default; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/impl/FieldMatchValidator.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/impl/FieldMatchValidator.java index 40837cb74..d2cb8e1eb 100644 --- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/impl/FieldMatchValidator.java +++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/impl/FieldMatchValidator.java @@ -24,8 +24,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts.beanvalidation.constraints.FieldMatch; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import java.beans.BeanInfo; import java.beans.Introspector; import java.beans.PropertyDescriptor; diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java index 75c25f9c3..fd14205e3 100644 --- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java +++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java @@ -35,9 +35,9 @@ import org.apache.struts.beanvalidation.constraints.ValidationGroup; import org.apache.struts.beanvalidation.validation.constant.ValidatorConstants; import org.apache.struts2.interceptor.validation.SkipValidation; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; -import javax.validation.groups.Default; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validator; +import jakarta.validation.groups.Default; import java.lang.reflect.Method; import java.util.Arrays; import java.util.Set; diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationManager.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationManager.java index 3f2a56131..0646dd360 100644 --- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationManager.java +++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationManager.java @@ -18,7 +18,7 @@ */ package org.apache.struts.beanvalidation.validation.interceptor; -import javax.validation.Validator; +import jakarta.validation.Validator; /** *

diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java index a3b56defd..9fb2359d4 100644 --- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java +++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java @@ -26,10 +26,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts.beanvalidation.validation.constant.ValidatorConstants; -import javax.validation.Configuration; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.Configuration; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; /** *

diff --git a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/ModelDrivenAction.java b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/ModelDrivenAction.java index d39e04847..c2fe152e1 100644 --- a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/ModelDrivenAction.java +++ b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/ModelDrivenAction.java @@ -22,7 +22,7 @@ import com.opensymphony.xwork2.ActionSupport; import com.opensymphony.xwork2.ModelDriven; import org.apache.struts.beanvalidation.models.Person; -import javax.validation.Valid; +import jakarta.validation.Valid; public class ModelDrivenAction extends ActionSupport implements ModelDriven, ModelDrivenActionInterface { diff --git a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/ValidateGroupAction.java b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/ValidateGroupAction.java index 6b17ab736..be4693463 100644 --- a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/ValidateGroupAction.java +++ b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/ValidateGroupAction.java @@ -23,7 +23,7 @@ import com.opensymphony.xwork2.ModelDriven; import org.apache.struts.beanvalidation.constraints.ValidationGroup; import org.apache.struts.beanvalidation.models.Person; -import javax.validation.Valid; +import jakarta.validation.Valid; public class ValidateGroupAction extends ActionSupport implements ModelDriven { diff --git a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/constraints/impl/FieldMatchValidatorTest.java b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/constraints/impl/FieldMatchValidatorTest.java index 5b5608c7e..baf951f82 100644 --- a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/constraints/impl/FieldMatchValidatorTest.java +++ b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/constraints/impl/FieldMatchValidatorTest.java @@ -22,7 +22,7 @@ import org.apache.struts.beanvalidation.constraints.FieldMatch; import org.junit.Test; import org.mockito.Mockito; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidatorContext; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/models/Address.java b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/models/Address.java index eddd1d004..3a3de59ea 100644 --- a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/models/Address.java +++ b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/models/Address.java @@ -18,9 +18,9 @@ */ package org.apache.struts.beanvalidation.models; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.validation.groups.Default; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.validation.groups.Default; public class Address { diff --git a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/models/Person.java b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/models/Person.java index be6b9cc1f..4c08e71bc 100644 --- a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/models/Person.java +++ b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/models/Person.java @@ -21,10 +21,10 @@ package org.apache.struts.beanvalidation.models; import org.hibernate.validator.constraints.Email; import org.hibernate.validator.constraints.NotBlank; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.validation.groups.Default; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.validation.groups.Default; public class Person { diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml index 307f9af5a..00ad8e265 100644 --- a/plugins/cdi/pom.xml +++ b/plugins/cdi/pom.xml @@ -35,8 +35,8 @@ - javax.enterprise - cdi-api + jakarta.enterprise + jakarta.enterprise.cdi-api provided @@ -55,6 +55,8 @@ org.springframework spring-test + + 4.3.0.RELEASE test diff --git a/plugins/cdi/src/main/java/org/apache/struts2/cdi/CdiObjectFactory.java b/plugins/cdi/src/main/java/org/apache/struts2/cdi/CdiObjectFactory.java index 08419c68c..30fd312ed 100644 --- a/plugins/cdi/src/main/java/org/apache/struts2/cdi/CdiObjectFactory.java +++ b/plugins/cdi/src/main/java/org/apache/struts2/cdi/CdiObjectFactory.java @@ -23,10 +23,10 @@ import com.opensymphony.xwork2.inject.Inject; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.InjectionTarget; -import javax.enterprise.inject.spi.InjectionTargetFactory; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.InjectionTarget; +import jakarta.enterprise.inject.spi.InjectionTargetFactory; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; diff --git a/plugins/cdi/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java b/plugins/cdi/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java index bae580cd4..9e127811b 100644 --- a/plugins/cdi/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java +++ b/plugins/cdi/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java @@ -25,7 +25,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.springframework.mock.jndi.SimpleNamingContextBuilder; -import javax.enterprise.inject.spi.InjectionTarget; +import jakarta.enterprise.inject.spi.InjectionTarget; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; diff --git a/plugins/cdi/src/test/java/org/apache/struts2/cdi/FooConsumer.java b/plugins/cdi/src/test/java/org/apache/struts2/cdi/FooConsumer.java index 53a8038d7..8c84a2ad4 100644 --- a/plugins/cdi/src/test/java/org/apache/struts2/cdi/FooConsumer.java +++ b/plugins/cdi/src/test/java/org/apache/struts2/cdi/FooConsumer.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.cdi; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * FooConsumer. diff --git a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java index 92e32ae5d..f155a9aa9 100644 --- a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java +++ b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java @@ -32,7 +32,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsException; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.net.MalformedURLException; import java.util.*; import java.net.URL; diff --git a/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java b/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java index 395b35028..51dd24ff6 100644 --- a/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java +++ b/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java @@ -39,7 +39,7 @@ import org.apache.logging.log4j.Logger; import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.IOException; import java.net.URL; import java.util.*; diff --git a/plugins/convention/src/test/java/org/apache/struts2/convention/ConventionUnknownHandlerTest.java b/plugins/convention/src/test/java/org/apache/struts2/convention/ConventionUnknownHandlerTest.java index 36ed5c2b2..6f2d491d9 100644 --- a/plugins/convention/src/test/java/org/apache/struts2/convention/ConventionUnknownHandlerTest.java +++ b/plugins/convention/src/test/java/org/apache/struts2/convention/ConventionUnknownHandlerTest.java @@ -27,7 +27,7 @@ import com.opensymphony.xwork2.inject.Container; import junit.framework.TestCase; import org.apache.struts2.result.ServletDispatcherResult; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.net.URL; import java.util.HashMap; import java.util.Iterator; diff --git a/plugins/convention/src/test/java/org/apache/struts2/convention/DefaultResultMapBuilderTest.java b/plugins/convention/src/test/java/org/apache/struts2/convention/DefaultResultMapBuilderTest.java index 5f5f609a5..763ddf1cc 100644 --- a/plugins/convention/src/test/java/org/apache/struts2/convention/DefaultResultMapBuilderTest.java +++ b/plugins/convention/src/test/java/org/apache/struts2/convention/DefaultResultMapBuilderTest.java @@ -31,7 +31,7 @@ import org.apache.struts2.result.ServletDispatcherResult; import org.easymock.EasyMock; import org.easymock.IAnswer; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.util.HashSet; import java.util.Map; import java.util.Set; diff --git a/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java b/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java index c44ca335a..4733abfad 100644 --- a/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java +++ b/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java @@ -72,7 +72,7 @@ import org.apache.struts2.convention.dontfind.DontFindMeAction; import org.apache.struts2.result.ServletDispatcherResult; import org.easymock.EasyMock; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.net.MalformedURLException; import java.util.*; diff --git a/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java b/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java index 0809ea0e2..40e235f26 100644 --- a/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java +++ b/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java @@ -21,9 +21,9 @@ package org.apache.struts2.validators; import java.util.HashMap; import java.util.Map; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.ApplicationMap; diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml index 53d6b4be2..9ac0eb501 100644 --- a/plugins/embeddedjsp/pom.xml +++ b/plugins/embeddedjsp/pom.xml @@ -71,8 +71,8 @@ test - javax.servlet - jstl + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api test diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPLoader.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPLoader.java index 57c19fba9..cdc5d6aa0 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPLoader.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPLoader.java @@ -35,10 +35,10 @@ import org.apache.struts2.compiler.MemoryJavaFileObject; import org.apache.struts2.jasper.JasperException; import org.apache.struts2.jasper.JspC; -import javax.servlet.Servlet; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.jsp.JspPage; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.jsp.JspPage; import javax.tools.DiagnosticCollector; import javax.tools.FileObject; import javax.tools.ForwardingJavaFileManager; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPRuntime.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPRuntime.java index d9425bbb6..d98e52559 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPRuntime.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPRuntime.java @@ -22,10 +22,10 @@ import com.opensymphony.xwork2.ActionContext; import org.apache.struts2.dispatcher.Parameter; import org.apache.struts2.url.QueryStringParser; -import javax.servlet.Servlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.HttpJspPage; +import jakarta.servlet.Servlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.HttpJspPage; import java.util.HashMap; import java.util.Map; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPServletConfig.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPServletConfig.java index 35abe2b1a..1e9de4dbe 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPServletConfig.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPServletConfig.java @@ -18,8 +18,8 @@ */ package org.apache.struts2; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; import java.util.Collections; import java.util.Enumeration; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/ServletCache.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/ServletCache.java index 15f59fb61..8afdb14a9 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/ServletCache.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/ServletCache.java @@ -18,7 +18,7 @@ */ package org.apache.struts2; -import javax.servlet.Servlet; +import jakarta.servlet.Servlet; import java.util.concurrent.*; /** diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/ExpressionFactoryImpl.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/ExpressionFactoryImpl.java index efb9155e1..bba4f8ee2 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/ExpressionFactoryImpl.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/ExpressionFactoryImpl.java @@ -18,10 +18,10 @@ */ package org.apache.struts2.el; -import javax.el.ELContext; -import javax.el.ExpressionFactory; -import javax.el.MethodExpression; -import javax.el.ValueExpression; +import jakarta.el.ELContext; +import jakarta.el.ExpressionFactory; +import jakarta.el.MethodExpression; +import jakarta.el.ValueExpression; import org.apache.struts2.el.lang.ELSupport; import org.apache.struts2.el.lang.ExpressionBuilder; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/MethodExpressionImpl.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/MethodExpressionImpl.java index ec2617149..45d50b3e2 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/MethodExpressionImpl.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/MethodExpressionImpl.java @@ -23,17 +23,17 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.el.ELContext; -import javax.el.ELException; -import javax.el.ELResolver; -import javax.el.Expression; -import javax.el.ExpressionFactory; -import javax.el.FunctionMapper; -import javax.el.MethodExpression; -import javax.el.MethodInfo; -import javax.el.MethodNotFoundException; -import javax.el.PropertyNotFoundException; -import javax.el.VariableMapper; +import jakarta.el.ELContext; +import jakarta.el.ELException; +import jakarta.el.ELResolver; +import jakarta.el.Expression; +import jakarta.el.ExpressionFactory; +import jakarta.el.FunctionMapper; +import jakarta.el.MethodExpression; +import jakarta.el.MethodInfo; +import jakarta.el.MethodNotFoundException; +import jakarta.el.PropertyNotFoundException; +import jakarta.el.VariableMapper; import org.apache.struts2.el.lang.EvaluationContext; import org.apache.struts2.el.lang.ExpressionBuilder; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/MethodExpressionLiteral.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/MethodExpressionLiteral.java index 83f24d68c..4e52893cf 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/MethodExpressionLiteral.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/MethodExpressionLiteral.java @@ -23,10 +23,10 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.el.ELContext; -import javax.el.ELException; -import javax.el.MethodExpression; -import javax.el.MethodInfo; +import jakarta.el.ELContext; +import jakarta.el.ELException; +import jakarta.el.MethodExpression; +import jakarta.el.MethodInfo; import org.apache.struts2.el.lang.ELSupport; import org.apache.struts2.el.util.ReflectionUtil; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/ValueExpressionImpl.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/ValueExpressionImpl.java index ba7e007ef..542813765 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/ValueExpressionImpl.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/ValueExpressionImpl.java @@ -23,16 +23,16 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.el.ELContext; -import javax.el.ELException; -import javax.el.ELResolver; -import javax.el.Expression; -import javax.el.ExpressionFactory; -import javax.el.FunctionMapper; -import javax.el.PropertyNotFoundException; -import javax.el.PropertyNotWritableException; -import javax.el.ValueExpression; -import javax.el.VariableMapper; +import jakarta.el.ELContext; +import jakarta.el.ELException; +import jakarta.el.ELResolver; +import jakarta.el.Expression; +import jakarta.el.ExpressionFactory; +import jakarta.el.FunctionMapper; +import jakarta.el.PropertyNotFoundException; +import jakarta.el.PropertyNotWritableException; +import jakarta.el.ValueExpression; +import jakarta.el.VariableMapper; import org.apache.struts2.el.lang.ELSupport; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/ValueExpressionLiteral.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/ValueExpressionLiteral.java index 5994a2494..677d4da78 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/ValueExpressionLiteral.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/ValueExpressionLiteral.java @@ -20,13 +20,13 @@ package org.apache.struts2.el; import java.io.Externalizable; import java.io.IOException; -import javax.el.ELContext; -import javax.el.PropertyNotWritableException; +import jakarta.el.ELContext; +import jakarta.el.PropertyNotWritableException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.el.ValueExpression; +import jakarta.el.ValueExpression; import org.apache.struts2.el.lang.ELSupport; import org.apache.struts2.el.util.MessageFactory; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/ELSupport.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/ELSupport.java index 95a69f8fa..c6815ca1b 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/ELSupport.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/ELSupport.java @@ -23,8 +23,8 @@ import java.beans.PropertyEditorManager; import java.math.BigDecimal; import java.math.BigInteger; -import javax.el.ELException; -import javax.el.PropertyNotFoundException; +import jakarta.el.ELException; +import jakarta.el.PropertyNotFoundException; import org.apache.struts2.el.util.MessageFactory; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/EvaluationContext.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/EvaluationContext.java index 978724c40..54c81e222 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/EvaluationContext.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/EvaluationContext.java @@ -20,10 +20,10 @@ package org.apache.struts2.el.lang; import java.util.Locale; -import javax.el.ELContext; -import javax.el.ELResolver; -import javax.el.FunctionMapper; -import javax.el.VariableMapper; +import jakarta.el.ELContext; +import jakarta.el.ELResolver; +import jakarta.el.FunctionMapper; +import jakarta.el.VariableMapper; public final class EvaluationContext extends ELContext { diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/ExpressionBuilder.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/ExpressionBuilder.java index ccc2f82b4..1835ee4be 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/ExpressionBuilder.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/ExpressionBuilder.java @@ -21,12 +21,12 @@ package org.apache.struts2.el.lang; import java.io.StringReader; import java.lang.reflect.Method; -import javax.el.ELContext; -import javax.el.ELException; -import javax.el.FunctionMapper; -import javax.el.MethodExpression; -import javax.el.ValueExpression; -import javax.el.VariableMapper; +import jakarta.el.ELContext; +import jakarta.el.ELException; +import jakarta.el.FunctionMapper; +import jakarta.el.MethodExpression; +import jakarta.el.ValueExpression; +import jakarta.el.VariableMapper; import org.apache.struts2.el.MethodExpressionImpl; import org.apache.struts2.el.MethodExpressionLiteral; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/FunctionMapperFactory.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/FunctionMapperFactory.java index 54aac4eef..af2ae1c29 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/FunctionMapperFactory.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/FunctionMapperFactory.java @@ -20,7 +20,7 @@ package org.apache.struts2.el.lang; import java.lang.reflect.Method; -import javax.el.FunctionMapper; +import jakarta.el.FunctionMapper; /** * @author Jacob Hookom [jacob@hookom.net] diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/FunctionMapperImpl.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/FunctionMapperImpl.java index 0b7b7f37d..38d9d83a4 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/FunctionMapperImpl.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/FunctionMapperImpl.java @@ -26,7 +26,7 @@ import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; -import javax.el.FunctionMapper; +import jakarta.el.FunctionMapper; import org.apache.struts2.el.util.ReflectionUtil; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/VariableMapperFactory.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/VariableMapperFactory.java index 41d4035ef..e77e44d19 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/VariableMapperFactory.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/VariableMapperFactory.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.el.lang; -import javax.el.ValueExpression; -import javax.el.VariableMapper; +import jakarta.el.ValueExpression; +import jakarta.el.VariableMapper; public class VariableMapperFactory extends VariableMapper { diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/VariableMapperImpl.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/VariableMapperImpl.java index a0012f9e3..fdee14e0a 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/VariableMapperImpl.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/VariableMapperImpl.java @@ -25,8 +25,8 @@ import java.io.ObjectOutput; import java.util.HashMap; import java.util.Map; -import javax.el.ValueExpression; -import javax.el.VariableMapper; +import jakarta.el.ValueExpression; +import jakarta.el.VariableMapper; public class VariableMapperImpl extends VariableMapper implements Externalizable { diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/ArithmeticNode.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/ArithmeticNode.java index f5f75ddd6..6f443dfb3 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/ArithmeticNode.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/ArithmeticNode.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstAnd.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstAnd.java index 6f79ad386..94c54904d 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstAnd.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstAnd.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstBracketSuffix.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstBracketSuffix.java index 0bf328d49..865d08335 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstBracketSuffix.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstBracketSuffix.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstChoice.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstChoice.java index 89845e24e..d77aa69a8 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstChoice.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstChoice.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstCompositeExpression.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstCompositeExpression.java index 05f8fe164..86f32172b 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstCompositeExpression.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstCompositeExpression.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstDeferredExpression.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstDeferredExpression.java index 1ea15bb4d..322ed47b5 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstDeferredExpression.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstDeferredExpression.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstDiv.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstDiv.java index 1d3259706..87fb7ccd6 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstDiv.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstDiv.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.ELArithmetic; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstDotSuffix.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstDotSuffix.java index 01e02d7cc..2b7ef6a64 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstDotSuffix.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstDotSuffix.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstDynamicExpression.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstDynamicExpression.java index be33015b8..6443a9f75 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstDynamicExpression.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstDynamicExpression.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstEmpty.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstEmpty.java index c53c2a521..81d531e4e 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstEmpty.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstEmpty.java @@ -21,7 +21,7 @@ package org.apache.struts2.el.parser; import java.util.Collection; import java.util.Map; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstEqual.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstEqual.java index b7aceb7ca..592d86a71 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstEqual.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstEqual.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstFalse.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstFalse.java index 9042e5283..50d0bc519 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstFalse.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstFalse.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstFloatingPoint.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstFloatingPoint.java index 6cb0ce7ac..f5abb56d6 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstFloatingPoint.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstFloatingPoint.java @@ -20,7 +20,7 @@ package org.apache.struts2.el.parser; import java.math.BigDecimal; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstFunction.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstFunction.java index acecf8cc6..75e4c171c 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstFunction.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstFunction.java @@ -21,8 +21,8 @@ package org.apache.struts2.el.parser; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import javax.el.ELException; -import javax.el.FunctionMapper; +import jakarta.el.ELException; +import jakarta.el.FunctionMapper; import org.apache.struts2.el.lang.EvaluationContext; import org.apache.struts2.el.util.MessageFactory; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstGreaterThan.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstGreaterThan.java index dad15a6bc..b65371c0a 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstGreaterThan.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstGreaterThan.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstGreaterThanEqual.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstGreaterThanEqual.java index a9cbc8b91..45cf09c21 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstGreaterThanEqual.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstGreaterThanEqual.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstIdentifier.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstIdentifier.java index 7cc120ee5..7c003be96 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstIdentifier.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstIdentifier.java @@ -18,12 +18,12 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; -import javax.el.MethodExpression; -import javax.el.MethodInfo; -import javax.el.MethodNotFoundException; -import javax.el.ValueExpression; -import javax.el.VariableMapper; +import jakarta.el.ELException; +import jakarta.el.MethodExpression; +import jakarta.el.MethodInfo; +import jakarta.el.MethodNotFoundException; +import jakarta.el.ValueExpression; +import jakarta.el.VariableMapper; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstInteger.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstInteger.java index 628c2dc40..05329b33f 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstInteger.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstInteger.java @@ -20,7 +20,7 @@ package org.apache.struts2.el.parser; import java.math.BigInteger; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstLessThan.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstLessThan.java index 54b61e854..71bc6f545 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstLessThan.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstLessThan.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstLessThanEqual.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstLessThanEqual.java index 271b3f9d8..449ad6379 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstLessThanEqual.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstLessThanEqual.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstLiteralExpression.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstLiteralExpression.java index a5727f61d..28459472b 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstLiteralExpression.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstLiteralExpression.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstMinus.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstMinus.java index 0573515f8..83007f665 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstMinus.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstMinus.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.ELArithmetic; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstMod.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstMod.java index f322c3a1a..b5a6e4a53 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstMod.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstMod.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.ELArithmetic; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstMult.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstMult.java index 389b03473..6c523faa0 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstMult.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstMult.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.ELArithmetic; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstNegative.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstNegative.java index f93b82391..8a8a2d443 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstNegative.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstNegative.java @@ -21,7 +21,7 @@ package org.apache.struts2.el.parser; import java.math.BigDecimal; import java.math.BigInteger; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstNot.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstNot.java index 3bda765ff..c4502145f 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstNot.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstNot.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstNotEqual.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstNotEqual.java index 8f1a2cdda..69dda755f 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstNotEqual.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstNotEqual.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstNull.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstNull.java index a06bb6228..7957116ef 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstNull.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstNull.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstOr.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstOr.java index 6b62f29e7..94ee77be7 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstOr.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstOr.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstPlus.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstPlus.java index ed783c3c1..7cff22bc5 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstPlus.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstPlus.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.ELArithmetic; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstString.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstString.java index d40c32215..fc4c1aa88 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstString.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstString.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstTrue.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstTrue.java index 3ecce9fa9..30a65c513 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstTrue.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstTrue.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstValue.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstValue.java index 572ced678..ea7df4887 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstValue.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstValue.java @@ -21,10 +21,10 @@ package org.apache.struts2.el.parser; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import javax.el.ELException; -import javax.el.ELResolver; -import javax.el.MethodInfo; -import javax.el.PropertyNotFoundException; +import jakarta.el.ELException; +import jakarta.el.ELResolver; +import jakarta.el.MethodInfo; +import jakarta.el.PropertyNotFoundException; import org.apache.struts2.el.lang.ELSupport; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/BooleanNode.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/BooleanNode.java index 586898495..574b24891 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/BooleanNode.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/BooleanNode.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/ELParser.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/ELParser.java index 56e31c49b..fc53178d2 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/ELParser.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/ELParser.java @@ -19,7 +19,7 @@ /* Generated By:JJTree&JavaCC: Do not edit this line. ELParser.java */ package org.apache.struts2.el.parser; -import javax.el.ELException; +import jakarta.el.ELException; import java.io.StringReader; public class ELParser/*@bgen(jjtree)*/ implements ELParserTreeConstants, ELParserConstants {/*@bgen(jjtree)*/ diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/ELParser.jjt b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/ELParser.jjt index 63bfe83b5..3c19ccec1 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/ELParser.jjt +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/ELParser.jjt @@ -38,7 +38,7 @@ options PARSER_BEGIN( ELParser ) package org.apache.el.parser; import java.io.StringReader; -import javax.el.ELException; +import jakarta.el.ELException; public class ELParser { public static Node parse(String ref) throws ELException diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/Node.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/Node.java index d433964f9..d3f3d4994 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/Node.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/Node.java @@ -20,8 +20,8 @@ package org.apache.struts2.el.parser; import org.apache.struts2.el.lang.EvaluationContext; -import javax.el.ELException; -import javax.el.MethodInfo; +import jakarta.el.ELException; +import jakarta.el.MethodInfo; /* All AST nodes must implement this interface. It provides basic machinery for constructing the parent and child relationships diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/SimpleNode.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/SimpleNode.java index 934b9ee48..be25b29cb 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/SimpleNode.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/SimpleNode.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.el.parser; -import javax.el.ELException; -import javax.el.MethodInfo; -import javax.el.PropertyNotWritableException; +import jakarta.el.ELException; +import jakarta.el.MethodInfo; +import jakarta.el.PropertyNotWritableException; import org.apache.struts2.el.lang.ELSupport; import org.apache.struts2.el.lang.EvaluationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/util/ReflectionUtil.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/util/ReflectionUtil.java index da58f719d..66951dfd8 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/util/ReflectionUtil.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/el/util/ReflectionUtil.java @@ -25,9 +25,9 @@ import java.lang.reflect.Array; import java.lang.reflect.Method; import java.util.Arrays; -import javax.el.ELException; -import javax.el.MethodNotFoundException; -import javax.el.PropertyNotFoundException; +import jakarta.el.ELException; +import jakarta.el.MethodNotFoundException; +import jakarta.el.PropertyNotFoundException; import org.apache.struts2.el.lang.ELSupport; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/EmbeddedServletOptions.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/EmbeddedServletOptions.java index 7ac4f247c..b8217e069 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/EmbeddedServletOptions.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/EmbeddedServletOptions.java @@ -21,8 +21,8 @@ package org.apache.struts2.jasper; import java.io.File; import java.util.*; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; import org.apache.struts2.jasper.compiler.TldLocationsCache; import org.apache.struts2.jasper.compiler.JspConfig; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JasperException.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JasperException.java index a3d922069..a49880477 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JasperException.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JasperException.java @@ -24,7 +24,7 @@ package org.apache.struts2.jasper; * * @author Anil K. Vijendran */ -public class JasperException extends javax.servlet.ServletException { +public class JasperException extends jakarta.servlet.ServletException { public JasperException(String reason) { super(reason); diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspCompilationContext.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspCompilationContext.java index b0bb32c1b..8bfecc6f3 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspCompilationContext.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspCompilationContext.java @@ -28,8 +28,8 @@ import org.apache.struts2.jasper.compiler.ServletWriter; import org.apache.struts2.jasper.servlet.JasperLoader; import org.apache.struts2.jasper.servlet.JspServletWrapper; -import javax.servlet.ServletContext; -import javax.servlet.jsp.tagext.TagInfo; +import jakarta.servlet.ServletContext; +import jakarta.servlet.jsp.tagext.TagInfo; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ELFunctionMapper.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ELFunctionMapper.java index a22462471..85307d942 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ELFunctionMapper.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ELFunctionMapper.java @@ -19,7 +19,7 @@ package org.apache.struts2.jasper.compiler; import java.util.*; -import javax.servlet.jsp.tagext.FunctionInfo; +import jakarta.servlet.jsp.tagext.FunctionInfo; import org.apache.struts2.jasper.JasperException; /** diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ELNode.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ELNode.java index 9d9e6d31e..eecf67f87 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ELNode.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ELNode.java @@ -19,7 +19,7 @@ package org.apache.struts2.jasper.compiler; import java.util.*; -import javax.servlet.jsp.tagext.FunctionInfo; +import jakarta.servlet.jsp.tagext.FunctionInfo; import org.apache.struts2.jasper.JasperException; /** diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Generator.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Generator.java index 5327afcc8..cb3bb1594 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Generator.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Generator.java @@ -34,12 +34,12 @@ import java.util.Iterator; import java.util.List; import java.util.Vector; -import javax.el.MethodExpression; -import javax.el.ValueExpression; -import javax.servlet.jsp.tagext.TagAttributeInfo; -import javax.servlet.jsp.tagext.TagInfo; -import javax.servlet.jsp.tagext.TagVariableInfo; -import javax.servlet.jsp.tagext.VariableInfo; +import jakarta.el.MethodExpression; +import jakarta.el.ValueExpression; +import jakarta.servlet.jsp.tagext.TagAttributeInfo; +import jakarta.servlet.jsp.tagext.TagInfo; +import jakarta.servlet.jsp.tagext.TagVariableInfo; +import jakarta.servlet.jsp.tagext.VariableInfo; import org.apache.struts2.jasper.Constants; import org.apache.struts2.jasper.JasperException; @@ -3442,7 +3442,7 @@ class Generator { // Generate class declaration out.printin("public final class "); out.println(className); - out.printil(" extends javax.servlet.jsp.tagext.SimpleTagSupport"); + out.printil(" extends jakarta.servlet.jsp.tagext.SimpleTagSupport"); out.printin(" implements org.apache.struts2.jasper.runtime.JspSourceDependent"); if (tagInfo.hasDynamicAttributes()) { out.println(","); diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ImplicitTagLibraryInfo.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ImplicitTagLibraryInfo.java index 21385ee65..e31da818d 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ImplicitTagLibraryInfo.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ImplicitTagLibraryInfo.java @@ -25,10 +25,10 @@ import java.util.Iterator; import java.util.Set; import java.util.Vector; -import javax.servlet.jsp.tagext.FunctionInfo; -import javax.servlet.jsp.tagext.TagFileInfo; -import javax.servlet.jsp.tagext.TagInfo; -import javax.servlet.jsp.tagext.TagLibraryInfo; +import jakarta.servlet.jsp.tagext.FunctionInfo; +import jakarta.servlet.jsp.tagext.TagFileInfo; +import jakarta.servlet.jsp.tagext.TagInfo; +import jakarta.servlet.jsp.tagext.TagLibraryInfo; import org.apache.struts2.jasper.JasperException; import org.apache.struts2.jasper.JspCompilationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JasperTagInfo.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JasperTagInfo.java index 17c1bd8b2..41f23f971 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JasperTagInfo.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JasperTagInfo.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.jasper.compiler; -import javax.servlet.jsp.tagext.*; +import jakarta.servlet.jsp.tagext.*; /** * TagInfo extension used by tag handlers that are implemented via tag files. diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspConfig.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspConfig.java index c82677392..d04b924b3 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspConfig.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspConfig.java @@ -23,7 +23,7 @@ import java.util.Iterator; import java.util.Vector; import java.net.URL; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.apache.struts2.jasper.JasperException; import org.apache.struts2.jasper.xmlparser.ParserUtils; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspDocumentParser.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspDocumentParser.java index 76bc1e22f..82ef247ea 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspDocumentParser.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspDocumentParser.java @@ -27,9 +27,9 @@ import java.util.Iterator; import java.util.List; import java.util.jar.JarFile; -import javax.servlet.jsp.tagext.TagFileInfo; -import javax.servlet.jsp.tagext.TagInfo; -import javax.servlet.jsp.tagext.TagLibraryInfo; +import jakarta.servlet.jsp.tagext.TagFileInfo; +import jakarta.servlet.jsp.tagext.TagInfo; +import jakarta.servlet.jsp.tagext.TagLibraryInfo; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspRuntimeContext.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspRuntimeContext.java index e9698e24a..1ff99c4af 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspRuntimeContext.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspRuntimeContext.java @@ -28,8 +28,8 @@ import org.apache.struts2.jasper.security.SecurityClassLoad; import org.apache.struts2.jasper.servlet.JspCServletContext; import org.apache.struts2.jasper.servlet.JspServletWrapper; -import javax.servlet.ServletContext; -import javax.servlet.jsp.JspFactory; +import jakarta.servlet.ServletContext; +import jakarta.servlet.jsp.JspFactory; import java.io.File; import java.io.FileNotFoundException; import java.io.FilePermission; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspUtil.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspUtil.java index 348b8c0f5..dfa3de515 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspUtil.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspUtil.java @@ -26,8 +26,8 @@ import org.apache.struts2.jasper.JspCompilationContext; import org.apache.struts2.jasper.el.ExpressionEvaluatorImpl; import org.xml.sax.Attributes; -import javax.el.FunctionMapper; -import javax.servlet.jsp.el.ExpressionEvaluator; +import jakarta.el.FunctionMapper; +import jakarta.servlet.jsp.el.ExpressionEvaluator; import java.io.*; import java.util.Vector; import java.util.jar.JarFile; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Node.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Node.java index 895ecd688..9a34f5de1 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Node.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Node.java @@ -23,22 +23,22 @@ import java.util.List; import java.util.Vector; import java.util.ArrayList; -import javax.el.ELContext; -import javax.el.ELException; -import javax.el.ExpressionFactory; -import javax.el.ValueExpression; -import javax.servlet.jsp.tagext.BodyTag; -import javax.servlet.jsp.tagext.DynamicAttributes; -import javax.servlet.jsp.tagext.IterationTag; -import javax.servlet.jsp.tagext.JspIdConsumer; -import javax.servlet.jsp.tagext.SimpleTag; -import javax.servlet.jsp.tagext.TagAttributeInfo; -import javax.servlet.jsp.tagext.TagData; -import javax.servlet.jsp.tagext.TagFileInfo; -import javax.servlet.jsp.tagext.TagInfo; -import javax.servlet.jsp.tagext.TagVariableInfo; -import javax.servlet.jsp.tagext.TryCatchFinally; -import javax.servlet.jsp.tagext.VariableInfo; +import jakarta.el.ELContext; +import jakarta.el.ELException; +import jakarta.el.ExpressionFactory; +import jakarta.el.ValueExpression; +import jakarta.servlet.jsp.tagext.BodyTag; +import jakarta.servlet.jsp.tagext.DynamicAttributes; +import jakarta.servlet.jsp.tagext.IterationTag; +import jakarta.servlet.jsp.tagext.JspIdConsumer; +import jakarta.servlet.jsp.tagext.SimpleTag; +import jakarta.servlet.jsp.tagext.TagAttributeInfo; +import jakarta.servlet.jsp.tagext.TagData; +import jakarta.servlet.jsp.tagext.TagFileInfo; +import jakarta.servlet.jsp.tagext.TagInfo; +import jakarta.servlet.jsp.tagext.TagVariableInfo; +import jakarta.servlet.jsp.tagext.TryCatchFinally; +import jakarta.servlet.jsp.tagext.VariableInfo; import org.apache.struts2.jasper.Constants; import org.apache.struts2.jasper.JasperException; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/PageDataImpl.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/PageDataImpl.java index c9c3cf21e..9228411a5 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/PageDataImpl.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/PageDataImpl.java @@ -23,7 +23,7 @@ import java.io.ByteArrayInputStream; import java.io.CharArrayWriter; import java.io.UnsupportedEncodingException; import java.util.ListIterator; -import javax.servlet.jsp.tagext.PageData; +import jakarta.servlet.jsp.tagext.PageData; import org.xml.sax.Attributes; import org.xml.sax.helpers.AttributesImpl; import org.apache.struts2.jasper.JasperException; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/PageInfo.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/PageInfo.java index 2f2d59956..dcf07f01a 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/PageInfo.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/PageInfo.java @@ -29,8 +29,8 @@ import org.apache.struts2.el.ExpressionFactoryImpl; import org.apache.struts2.jasper.Constants; import org.apache.struts2.jasper.JasperException; -import javax.el.ExpressionFactory; -import javax.servlet.jsp.tagext.TagLibraryInfo; +import jakarta.el.ExpressionFactory; +import jakarta.servlet.jsp.tagext.TagLibraryInfo; /** * A repository for various info about the translation unit under compilation. diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Parser.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Parser.java index a8cef55b0..8220c059f 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Parser.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Parser.java @@ -24,10 +24,10 @@ import java.net.URL; import java.util.Iterator; import java.util.List; -import javax.servlet.jsp.tagext.TagAttributeInfo; -import javax.servlet.jsp.tagext.TagFileInfo; -import javax.servlet.jsp.tagext.TagInfo; -import javax.servlet.jsp.tagext.TagLibraryInfo; +import jakarta.servlet.jsp.tagext.TagAttributeInfo; +import jakarta.servlet.jsp.tagext.TagFileInfo; +import jakarta.servlet.jsp.tagext.TagInfo; +import jakarta.servlet.jsp.tagext.TagLibraryInfo; import org.apache.struts2.jasper.JasperException; import org.apache.struts2.jasper.JspCompilationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ScriptingVariabler.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ScriptingVariabler.java index a5a4fc492..6be2019a2 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ScriptingVariabler.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ScriptingVariabler.java @@ -19,7 +19,7 @@ package org.apache.struts2.jasper.compiler; import java.util.*; -import javax.servlet.jsp.tagext.*; +import jakarta.servlet.jsp.tagext.*; import org.apache.struts2.jasper.JasperException; /** diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/TagFileProcessor.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/TagFileProcessor.java index bbf2417af..b16520bd7 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/TagFileProcessor.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/TagFileProcessor.java @@ -28,15 +28,15 @@ import java.util.List; import java.util.Vector; import java.util.HashMap; -import javax.el.MethodExpression; -import javax.el.ValueExpression; -import javax.servlet.jsp.tagext.TagAttributeInfo; -import javax.servlet.jsp.tagext.TagExtraInfo; -import javax.servlet.jsp.tagext.TagFileInfo; -import javax.servlet.jsp.tagext.TagInfo; -import javax.servlet.jsp.tagext.TagLibraryInfo; -import javax.servlet.jsp.tagext.TagVariableInfo; -import javax.servlet.jsp.tagext.VariableInfo; +import jakarta.el.MethodExpression; +import jakarta.el.ValueExpression; +import jakarta.servlet.jsp.tagext.TagAttributeInfo; +import jakarta.servlet.jsp.tagext.TagExtraInfo; +import jakarta.servlet.jsp.tagext.TagFileInfo; +import jakarta.servlet.jsp.tagext.TagInfo; +import jakarta.servlet.jsp.tagext.TagLibraryInfo; +import jakarta.servlet.jsp.tagext.TagVariableInfo; +import jakarta.servlet.jsp.tagext.VariableInfo; import org.apache.struts2.jasper.JasperException; import org.apache.struts2.jasper.JspCompilationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/TagLibraryInfoImpl.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/TagLibraryInfoImpl.java index 341e91e96..22352197e 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/TagLibraryInfoImpl.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/TagLibraryInfoImpl.java @@ -34,17 +34,17 @@ import java.util.Vector; import java.util.jar.JarFile; import java.util.zip.ZipEntry; -import javax.servlet.jsp.tagext.FunctionInfo; -import javax.servlet.jsp.tagext.PageData; -import javax.servlet.jsp.tagext.TagAttributeInfo; -import javax.servlet.jsp.tagext.TagExtraInfo; -import javax.servlet.jsp.tagext.TagFileInfo; -import javax.servlet.jsp.tagext.TagInfo; -import javax.servlet.jsp.tagext.TagLibraryInfo; -import javax.servlet.jsp.tagext.TagLibraryValidator; -import javax.servlet.jsp.tagext.TagVariableInfo; -import javax.servlet.jsp.tagext.ValidationMessage; -import javax.servlet.jsp.tagext.VariableInfo; +import jakarta.servlet.jsp.tagext.FunctionInfo; +import jakarta.servlet.jsp.tagext.PageData; +import jakarta.servlet.jsp.tagext.TagAttributeInfo; +import jakarta.servlet.jsp.tagext.TagExtraInfo; +import jakarta.servlet.jsp.tagext.TagFileInfo; +import jakarta.servlet.jsp.tagext.TagInfo; +import jakarta.servlet.jsp.tagext.TagLibraryInfo; +import jakarta.servlet.jsp.tagext.TagLibraryValidator; +import jakarta.servlet.jsp.tagext.TagVariableInfo; +import jakarta.servlet.jsp.tagext.ValidationMessage; +import jakarta.servlet.jsp.tagext.VariableInfo; import org.apache.struts2.jasper.JasperException; import org.apache.struts2.jasper.JspCompilationContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/TagPluginManager.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/TagPluginManager.java index 0b7c2debd..af980ee64 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/TagPluginManager.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/TagPluginManager.java @@ -20,7 +20,7 @@ package org.apache.struts2.jasper.compiler; import java.util.*; import java.io.*; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.apache.struts2.jasper.JasperException; import org.apache.struts2.jasper.xmlparser.ParserUtils; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/TldLocationsCache.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/TldLocationsCache.java index a8a26be47..d2d484598 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/TldLocationsCache.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/TldLocationsCache.java @@ -30,7 +30,7 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; import org.xml.sax.InputSource; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.apache.struts2.jasper.Constants; import org.apache.struts2.jasper.JasperException; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Validator.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Validator.java index 553011fde..35a29635a 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Validator.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Validator.java @@ -23,18 +23,18 @@ import org.apache.struts2.jasper.JasperException; import org.apache.struts2.jasper.el.ELContextImpl; import org.xml.sax.Attributes; -import javax.el.ELException; -import javax.el.ExpressionFactory; -import javax.el.FunctionMapper; -import javax.servlet.jsp.tagext.FunctionInfo; -import javax.servlet.jsp.tagext.JspFragment; -import javax.servlet.jsp.tagext.PageData; -import javax.servlet.jsp.tagext.TagAttributeInfo; -import javax.servlet.jsp.tagext.TagData; -import javax.servlet.jsp.tagext.TagExtraInfo; -import javax.servlet.jsp.tagext.TagInfo; -import javax.servlet.jsp.tagext.TagLibraryInfo; -import javax.servlet.jsp.tagext.ValidationMessage; +import jakarta.el.ELException; +import jakarta.el.ExpressionFactory; +import jakarta.el.FunctionMapper; +import jakarta.servlet.jsp.tagext.FunctionInfo; +import jakarta.servlet.jsp.tagext.JspFragment; +import jakarta.servlet.jsp.tagext.PageData; +import jakarta.servlet.jsp.tagext.TagAttributeInfo; +import jakarta.servlet.jsp.tagext.TagData; +import jakarta.servlet.jsp.tagext.TagExtraInfo; +import jakarta.servlet.jsp.tagext.TagInfo; +import jakarta.servlet.jsp.tagext.TagLibraryInfo; +import jakarta.servlet.jsp.tagext.ValidationMessage; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.HashMap; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ELContextImpl.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ELContextImpl.java index 631a4149a..a0b175269 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ELContextImpl.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ELContextImpl.java @@ -22,11 +22,11 @@ import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; -import javax.el.ELContext; -import javax.el.ELResolver; -import javax.el.FunctionMapper; -import javax.el.ValueExpression; -import javax.el.VariableMapper; +import jakarta.el.ELContext; +import jakarta.el.ELResolver; +import jakarta.el.FunctionMapper; +import jakarta.el.ValueExpression; +import jakarta.el.VariableMapper; /** * Implementation of ELContext diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ELContextWrapper.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ELContextWrapper.java index e14bfc862..c8016bd84 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ELContextWrapper.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ELContextWrapper.java @@ -20,10 +20,10 @@ package org.apache.struts2.jasper.el; import java.util.Locale; -import javax.el.ELContext; -import javax.el.ELResolver; -import javax.el.FunctionMapper; -import javax.el.VariableMapper; +import jakarta.el.ELContext; +import jakarta.el.ELResolver; +import jakarta.el.FunctionMapper; +import jakarta.el.VariableMapper; /** * Simple ELContextWrapper for runtime evaluation of EL w/ dynamic FunctionMappers diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ELResolverImpl.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ELResolverImpl.java index 7e5b3700e..3555cb7eb 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ELResolverImpl.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ELResolverImpl.java @@ -20,18 +20,18 @@ package org.apache.struts2.jasper.el; import java.util.Iterator; -import javax.el.ArrayELResolver; -import javax.el.BeanELResolver; -import javax.el.CompositeELResolver; -import javax.el.ELContext; -import javax.el.ELException; -import javax.el.ELResolver; -import javax.el.ListELResolver; -import javax.el.MapELResolver; -import javax.el.PropertyNotFoundException; -import javax.el.PropertyNotWritableException; -import javax.el.ResourceBundleELResolver; -import javax.servlet.jsp.el.VariableResolver; +import jakarta.el.ArrayELResolver; +import jakarta.el.BeanELResolver; +import jakarta.el.CompositeELResolver; +import jakarta.el.ELContext; +import jakarta.el.ELException; +import jakarta.el.ELResolver; +import jakarta.el.ListELResolver; +import jakarta.el.MapELResolver; +import jakarta.el.PropertyNotFoundException; +import jakarta.el.PropertyNotWritableException; +import jakarta.el.ResourceBundleELResolver; +import jakarta.servlet.jsp.el.VariableResolver; public final class ELResolverImpl extends ELResolver { @@ -63,7 +63,7 @@ public final class ELResolverImpl extends ELResolver { try { return this.variableResolver.resolveVariable(property .toString()); - } catch (javax.servlet.jsp.el.ELException e) { + } catch (jakarta.servlet.jsp.el.ELException e) { throw new ELException(e.getMessage(), e.getCause()); } } @@ -88,7 +88,7 @@ public final class ELResolverImpl extends ELResolver { Object obj = this.variableResolver.resolveVariable(property .toString()); return (obj != null) ? obj.getClass() : null; - } catch (javax.servlet.jsp.el.ELException e) { + } catch (jakarta.servlet.jsp.el.ELException e) { throw new ELException(e.getMessage(), e.getCause()); } } diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ExpressionEvaluatorImpl.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ExpressionEvaluatorImpl.java index d05155343..8b1b3e5ca 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ExpressionEvaluatorImpl.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ExpressionEvaluatorImpl.java @@ -18,14 +18,14 @@ */ package org.apache.struts2.jasper.el; -import javax.el.ExpressionFactory; -import javax.el.ValueExpression; -import javax.servlet.jsp.el.ELException; -import javax.servlet.jsp.el.ELParseException; -import javax.servlet.jsp.el.Expression; -import javax.servlet.jsp.el.ExpressionEvaluator; -import javax.servlet.jsp.el.FunctionMapper; -import javax.servlet.jsp.el.VariableResolver; +import jakarta.el.ExpressionFactory; +import jakarta.el.ValueExpression; +import jakarta.servlet.jsp.el.ELException; +import jakarta.servlet.jsp.el.ELParseException; +import jakarta.servlet.jsp.el.Expression; +import jakarta.servlet.jsp.el.ExpressionEvaluator; +import jakarta.servlet.jsp.el.FunctionMapper; +import jakarta.servlet.jsp.el.VariableResolver; public final class ExpressionEvaluatorImpl extends ExpressionEvaluator { @@ -45,7 +45,7 @@ public final class ExpressionEvaluatorImpl extends ExpressionEvaluator { } ValueExpression ve = this.factory.createValueExpression(ctx, expression, expectedType); return new ExpressionImpl(ve); - } catch (javax.el.ELException e) { + } catch (jakarta.el.ELException e) { throw new ELParseException(e.getMessage()); } } diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ExpressionImpl.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ExpressionImpl.java index 4a9825bb6..d472ab73f 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ExpressionImpl.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ExpressionImpl.java @@ -18,11 +18,11 @@ */ package org.apache.struts2.jasper.el; -import javax.el.ELContext; -import javax.el.ValueExpression; -import javax.servlet.jsp.el.ELException; -import javax.servlet.jsp.el.Expression; -import javax.servlet.jsp.el.VariableResolver; +import jakarta.el.ELContext; +import jakarta.el.ValueExpression; +import jakarta.servlet.jsp.el.ELException; +import jakarta.servlet.jsp.el.Expression; +import jakarta.servlet.jsp.el.VariableResolver; public final class ExpressionImpl extends Expression { diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/FunctionMapperImpl.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/FunctionMapperImpl.java index b26c5ed58..c8bc798a6 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/FunctionMapperImpl.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/FunctionMapperImpl.java @@ -20,9 +20,9 @@ package org.apache.struts2.jasper.el; import java.lang.reflect.Method; -import javax.servlet.jsp.el.FunctionMapper; +import jakarta.servlet.jsp.el.FunctionMapper; -public final class FunctionMapperImpl extends javax.el.FunctionMapper { +public final class FunctionMapperImpl extends jakarta.el.FunctionMapper { private final FunctionMapper fnMapper; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspELException.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspELException.java index 158b5f45f..731495ed0 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspELException.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspELException.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.jasper.el; -import javax.el.ELException; +import jakarta.el.ELException; public class JspELException extends ELException { diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspMethodExpression.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspMethodExpression.java index 1a911366e..73d2824ff 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspMethodExpression.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspMethodExpression.java @@ -23,12 +23,12 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.el.ELContext; -import javax.el.ELException; -import javax.el.MethodExpression; -import javax.el.MethodInfo; -import javax.el.MethodNotFoundException; -import javax.el.PropertyNotFoundException; +import jakarta.el.ELContext; +import jakarta.el.ELException; +import jakarta.el.MethodExpression; +import jakarta.el.MethodInfo; +import jakarta.el.MethodNotFoundException; +import jakarta.el.PropertyNotFoundException; public final class JspMethodExpression extends MethodExpression implements Externalizable { diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspMethodNotFoundException.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspMethodNotFoundException.java index 0232972ee..35ea9311e 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspMethodNotFoundException.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspMethodNotFoundException.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.jasper.el; -import javax.el.MethodNotFoundException; +import jakarta.el.MethodNotFoundException; public class JspMethodNotFoundException extends MethodNotFoundException { diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspPropertyNotFoundException.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspPropertyNotFoundException.java index 278f42cec..d3b3f181b 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspPropertyNotFoundException.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspPropertyNotFoundException.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.jasper.el; -import javax.el.PropertyNotFoundException; +import jakarta.el.PropertyNotFoundException; public final class JspPropertyNotFoundException extends PropertyNotFoundException { diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspPropertyNotWritableException.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspPropertyNotWritableException.java index 698fe9d80..c997efb3a 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspPropertyNotWritableException.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspPropertyNotWritableException.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.jasper.el; -import javax.el.PropertyNotWritableException; +import jakarta.el.PropertyNotWritableException; public class JspPropertyNotWritableException extends PropertyNotWritableException { diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspValueExpression.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspValueExpression.java index acd17d801..99580fcb2 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspValueExpression.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspValueExpression.java @@ -23,11 +23,11 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.el.ELContext; -import javax.el.ELException; -import javax.el.PropertyNotFoundException; -import javax.el.PropertyNotWritableException; -import javax.el.ValueExpression; +import jakarta.el.ELContext; +import jakarta.el.ELException; +import jakarta.el.PropertyNotFoundException; +import jakarta.el.PropertyNotWritableException; +import jakarta.el.ValueExpression; /** * Wrapper for providing context to ValueExpressions diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/VariableResolverImpl.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/VariableResolverImpl.java index 5ae257e59..95e05a75e 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/VariableResolverImpl.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/VariableResolverImpl.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.jasper.el; -import javax.el.ELContext; -import javax.servlet.jsp.el.ELException; -import javax.servlet.jsp.el.VariableResolver; +import jakarta.el.ELContext; +import jakarta.servlet.jsp.el.ELException; +import jakarta.servlet.jsp.el.VariableResolver; public final class VariableResolverImpl implements VariableResolver { diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/BodyContentImpl.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/BodyContentImpl.java index 1f06f8c7f..12fa452c2 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/BodyContentImpl.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/BodyContentImpl.java @@ -23,8 +23,8 @@ import java.io.IOException; import java.io.Reader; import java.io.Writer; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.tagext.BodyContent; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.tagext.BodyContent; import org.apache.struts2.jasper.Constants; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/HttpJspBase.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/HttpJspBase.java index d0d6e37ef..dad956561 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/HttpJspBase.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/HttpJspBase.java @@ -20,13 +20,13 @@ package org.apache.struts2.jasper.runtime; import java.io.IOException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.HttpJspPage; -import javax.servlet.jsp.JspFactory; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.HttpJspPage; +import jakarta.servlet.jsp.JspFactory; import org.apache.struts2.jasper.compiler.Localizer; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/InstanceHelper.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/InstanceHelper.java index 7be48a920..22227709c 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/InstanceHelper.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/InstanceHelper.java @@ -24,8 +24,8 @@ import java.util.Map; import java.util.WeakHashMap; import javax.naming.NamingException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; import org.apache.tomcat.InstanceManager; import org.apache.tomcat.SimpleInstanceManager; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspApplicationContextImpl.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspApplicationContextImpl.java index b18983a1a..debe3cb45 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspApplicationContextImpl.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspApplicationContextImpl.java @@ -22,21 +22,21 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import javax.el.ArrayELResolver; -import javax.el.BeanELResolver; -import javax.el.CompositeELResolver; -import javax.el.ELContextEvent; -import javax.el.ELContextListener; -import javax.el.ELResolver; -import javax.el.ExpressionFactory; -import javax.el.ListELResolver; -import javax.el.MapELResolver; -import javax.el.ResourceBundleELResolver; -import javax.servlet.ServletContext; -import javax.servlet.jsp.JspApplicationContext; -import javax.servlet.jsp.JspContext; -import javax.servlet.jsp.el.ImplicitObjectELResolver; -import javax.servlet.jsp.el.ScopedAttributeELResolver; +import jakarta.el.ArrayELResolver; +import jakarta.el.BeanELResolver; +import jakarta.el.CompositeELResolver; +import jakarta.el.ELContextEvent; +import jakarta.el.ELContextListener; +import jakarta.el.ELResolver; +import jakarta.el.ExpressionFactory; +import jakarta.el.ListELResolver; +import jakarta.el.MapELResolver; +import jakarta.el.ResourceBundleELResolver; +import jakarta.servlet.ServletContext; +import jakarta.servlet.jsp.JspApplicationContext; +import jakarta.servlet.jsp.JspContext; +import jakarta.servlet.jsp.el.ImplicitObjectELResolver; +import jakarta.servlet.jsp.el.ScopedAttributeELResolver; import org.apache.struts2.el.ExpressionFactoryImpl; import org.apache.struts2.jasper.el.ELContextImpl; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspContextWrapper.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspContextWrapper.java index 3048fa447..fdeec90a0 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspContextWrapper.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspContextWrapper.java @@ -26,22 +26,22 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import javax.el.ELContext; -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.HttpSession; -import javax.servlet.jsp.JspContext; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.el.ELException; -import javax.servlet.jsp.el.ExpressionEvaluator; -import javax.servlet.jsp.el.VariableResolver; -import javax.servlet.jsp.tagext.BodyContent; -import javax.servlet.jsp.tagext.VariableInfo; +import jakarta.el.ELContext; +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.HttpSession; +import jakarta.servlet.jsp.JspContext; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.el.ELException; +import jakarta.servlet.jsp.el.ExpressionEvaluator; +import jakarta.servlet.jsp.el.VariableResolver; +import jakarta.servlet.jsp.tagext.BodyContent; +import jakarta.servlet.jsp.tagext.VariableInfo; import org.apache.struts2.jasper.compiler.Localizer; import org.apache.struts2.jasper.util.Enumerator; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspFactoryImpl.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspFactoryImpl.java index 89c364ff7..ce5b771cf 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspFactoryImpl.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspFactoryImpl.java @@ -21,14 +21,14 @@ package org.apache.struts2.jasper.runtime; import java.security.AccessController; import java.security.PrivilegedAction; -import javax.servlet.Servlet; -import javax.servlet.ServletContext; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.jsp.JspApplicationContext; -import javax.servlet.jsp.JspEngineInfo; -import javax.servlet.jsp.JspFactory; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.jsp.JspApplicationContext; +import jakarta.servlet.jsp.JspEngineInfo; +import jakarta.servlet.jsp.JspFactory; +import jakarta.servlet.jsp.PageContext; import org.apache.struts2.jasper.Constants; import org.apache.juli.logging.Log; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspFragmentHelper.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspFragmentHelper.java index 7559e9d6f..ca8d5a949 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspFragmentHelper.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspFragmentHelper.java @@ -18,10 +18,10 @@ */ package org.apache.struts2.jasper.runtime; -import javax.servlet.jsp.JspContext; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.JspFragment; -import javax.servlet.jsp.tagext.JspTag; +import jakarta.servlet.jsp.JspContext; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.tagext.JspFragment; +import jakarta.servlet.jsp.tagext.JspTag; /** * Helper class from which all Jsp Fragment helper classes extend. diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspRuntimeLibrary.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspRuntimeLibrary.java index 985d50b0d..0ce5decba 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspRuntimeLibrary.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspRuntimeLibrary.java @@ -22,14 +22,14 @@ import org.apache.struts2.jasper.Constants; import org.apache.struts2.jasper.JasperException; import org.apache.struts2.jasper.compiler.Localizer; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.BodyContent; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.tagext.BodyContent; import java.beans.PropertyEditor; import java.beans.PropertyEditorManager; import java.io.ByteArrayOutputStream; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspWriterImpl.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspWriterImpl.java index 5ad7cc5d0..56ab7cdb9 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspWriterImpl.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspWriterImpl.java @@ -23,8 +23,8 @@ import java.io.Writer; import java.security.AccessController; import java.security.PrivilegedAction; -import javax.servlet.ServletResponse; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.jsp.JspWriter; import org.apache.struts2.jasper.Constants; import org.apache.struts2.jasper.compiler.Localizer; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/PageContextImpl.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/PageContextImpl.java index c17488942..bceeb0247 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/PageContextImpl.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/PageContextImpl.java @@ -27,26 +27,26 @@ import java.security.PrivilegedExceptionAction; import java.util.Enumeration; import java.util.HashMap; -import javax.el.ELContext; -import javax.el.ExpressionFactory; -import javax.el.ValueExpression; -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.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspFactory; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.el.ELException; -import javax.servlet.jsp.el.ExpressionEvaluator; -import javax.servlet.jsp.el.VariableResolver; -import javax.servlet.jsp.tagext.BodyContent; +import jakarta.el.ELContext; +import jakarta.el.ExpressionFactory; +import jakarta.el.ValueExpression; +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.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspFactory; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.el.ELException; +import jakarta.servlet.jsp.el.ExpressionEvaluator; +import jakarta.servlet.jsp.el.VariableResolver; +import jakarta.servlet.jsp.tagext.BodyContent; import org.apache.struts2.jasper.Constants; import org.apache.struts2.jasper.compiler.Localizer; @@ -850,7 +850,7 @@ public class PageContextImpl extends PageContext { Throwable rootCause = null; if (t instanceof JspException) { - rootCause = ((JspException) t).getRootCause(); + rootCause = ((JspException) t).getCause(); } else if (t instanceof ELException) { rootCause = ((ELException) t).getRootCause(); } diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/PerThreadTagHandlerPool.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/PerThreadTagHandlerPool.java index eee2bedeb..4640f8a2d 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/PerThreadTagHandlerPool.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/PerThreadTagHandlerPool.java @@ -21,9 +21,9 @@ package org.apache.struts2.jasper.runtime; import java.util.Enumeration; import java.util.Vector; -import javax.servlet.ServletConfig; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.Tag; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.Tag; import org.apache.struts2.jasper.Constants; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/ProtectedFunctionMapper.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/ProtectedFunctionMapper.java index f8a1a675f..dec69c2c6 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/ProtectedFunctionMapper.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/ProtectedFunctionMapper.java @@ -24,7 +24,7 @@ import java.security.PrivilegedAction; import java.security.PrivilegedExceptionAction; import java.security.PrivilegedActionException; import java.lang.reflect.Method; -import javax.servlet.jsp.el.FunctionMapper; +import jakarta.servlet.jsp.el.FunctionMapper; import org.apache.struts2.jasper.security.SecurityUtil; @@ -35,7 +35,7 @@ import org.apache.struts2.jasper.security.SecurityUtil; * @author Mark Roth * @author Kin-man Chung */ -public final class ProtectedFunctionMapper extends javax.el.FunctionMapper +public final class ProtectedFunctionMapper extends jakarta.el.FunctionMapper implements FunctionMapper { /** diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/ServletResponseWrapperInclude.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/ServletResponseWrapperInclude.java index c2fb30fa5..06e1877a7 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/ServletResponseWrapperInclude.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/ServletResponseWrapperInclude.java @@ -21,11 +21,11 @@ package org.apache.struts2.jasper.runtime; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletOutputStream; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.jsp.JspWriter; /** * ServletResponseWrapper used by the JSP 'include' action. diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/TagHandlerPool.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/TagHandlerPool.java index c93de922c..0c6d6359e 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/TagHandlerPool.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/TagHandlerPool.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.jasper.runtime; -import javax.servlet.ServletConfig; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.Tag; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.Tag; import org.apache.struts2.jasper.Constants; import org.apache.juli.logging.Log; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/servlet/JspCServletContext.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/servlet/JspCServletContext.java index 94fee5469..66b62797b 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/servlet/JspCServletContext.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/servlet/JspCServletContext.java @@ -34,17 +34,18 @@ import java.util.Hashtable; import java.util.Map; import java.util.Set; import java.util.Vector; -import javax.servlet.Filter; -import javax.servlet.FilterRegistration; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterRegistration; -import javax.servlet.RequestDispatcher; -import javax.servlet.Servlet; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRegistration; -import javax.servlet.SessionCookieConfig; -import javax.servlet.SessionTrackingMode; -import javax.servlet.descriptor.JspConfigDescriptor; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRegistration; +import jakarta.servlet.ServletRegistration.Dynamic; +import jakarta.servlet.SessionCookieConfig; +import jakarta.servlet.SessionTrackingMode; +import jakarta.servlet.descriptor.JspConfigDescriptor; import org.apache.struts2.ServletActionContext; @@ -564,4 +565,47 @@ public class JspCServletContext implements ServletContext { return ("JspCServletContext_VirtualServer"); } + + @Override + public Dynamic addJspFile(String jspName, String jspFile) { + return (null); + } + + + @Override + public int getSessionTimeout() { + return (0); + } + + + @Override + public void setSessionTimeout(int sessionTimeout) { + return; + } + + + @Override + public String getRequestCharacterEncoding() { + return (null); + } + + + @Override + public void setRequestCharacterEncoding(String encoding) { + return; + + } + + + @Override + public String getResponseCharacterEncoding() { + return (null); + } + + + @Override + public void setResponseCharacterEncoding(String encoding) { + return; + } + } diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/servlet/JspServlet.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/servlet/JspServlet.java index fbe23424b..ccc8da3d4 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/servlet/JspServlet.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/servlet/JspServlet.java @@ -22,12 +22,12 @@ import java.io.IOException; import java.lang.reflect.Constructor; import java.util.Enumeration; -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 org.apache.struts2.jasper.Constants; import org.apache.struts2.jasper.EmbeddedServletOptions; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/servlet/JspServletWrapper.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/servlet/JspServletWrapper.java index 8a04b2eea..35f70d27c 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/servlet/JspServletWrapper.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/servlet/JspServletWrapper.java @@ -22,15 +22,14 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.net.URL; -import javax.servlet.Servlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.SingleThreadModel; -import javax.servlet.UnavailableException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.tagext.TagInfo; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.UnavailableException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.tagext.TagInfo; import org.apache.struts2.jasper.JasperException; import org.apache.struts2.jasper.JspCompilationContext; @@ -365,15 +364,7 @@ public class JspServletWrapper { /* * (3) Service request */ - if (theServlet instanceof SingleThreadModel) { - // sync on the wrapper so that the freshness - // of the page is determined right before servicing - synchronized (this) { - theServlet.service(request, response); - } - } else { - theServlet.service(request, response); - } + theServlet.service(request, response); } catch (UnavailableException ex) { String includeRequestUri = (String) diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/Util.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/Util.java index 4896a2fae..b3ce7d0a9 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/Util.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/Util.java @@ -27,14 +27,14 @@ import java.io.StringWriter; import java.io.UnsupportedEncodingException; import java.util.Locale; -import javax.servlet.ServletOutputStream; -import javax.servlet.WriteListener; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspTagException; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.WriteListener; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspTagException; +import jakarta.servlet.jsp.PageContext; /** * Util contains some often used consts, static methods and embedded class diff --git a/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java b/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java index 128462bb3..c3830b2c6 100644 --- a/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java +++ b/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java @@ -45,9 +45,9 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockServletConfig; import org.springframework.mock.web.MockServletContext; -import javax.servlet.Servlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.Servlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import java.io.InputStream; import java.util.ArrayList; import java.util.HashMap; diff --git a/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/AbstractGxpResult.java b/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/AbstractGxpResult.java index fd0d3160d..3e89c6281 100644 --- a/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/AbstractGxpResult.java +++ b/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/AbstractGxpResult.java @@ -21,7 +21,7 @@ package org.apache.struts2.views.gxp; import com.opensymphony.xwork2.Result; import org.apache.struts2.ServletActionContext; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.Writer; import java.util.Locale; diff --git a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java index 088267829..743826c33 100644 --- a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java +++ b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java @@ -43,10 +43,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.result.StrutsResultSupport; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; diff --git a/plugins/jasperreports/src/test/java/org/apache/struts2/views/jasperreports/JasperReportsResultTest.java b/plugins/jasperreports/src/test/java/org/apache/struts2/views/jasperreports/JasperReportsResultTest.java index 4a563df94..8ac692886 100644 --- a/plugins/jasperreports/src/test/java/org/apache/struts2/views/jasperreports/JasperReportsResultTest.java +++ b/plugins/jasperreports/src/test/java/org/apache/struts2/views/jasperreports/JasperReportsResultTest.java @@ -27,7 +27,7 @@ import net.sf.jasperreports.engine.JasperCompileManager; import org.apache.struts2.StrutsStatics; import org.apache.struts2.junit.StrutsTestCase; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import java.net.URL; import java.sql.Connection; import java.util.HashMap; diff --git a/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AbstractTest.java b/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AbstractTest.java index 3c6c37f97..f48c52b2f 100644 --- a/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AbstractTest.java +++ b/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AbstractTest.java @@ -33,8 +33,8 @@ import org.apache.struts2.components.UIBean; import org.apache.struts2.components.template.Template; import org.apache.struts2.components.template.TemplateRenderingContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.StringWriter; import java.util.HashMap; import java.util.Map; diff --git a/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java b/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java index c7c16a333..26c2827a1 100644 --- a/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java +++ b/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java @@ -29,7 +29,7 @@ import org.jfree.chart.JFreeChart; import java.io.OutputStream; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; /** * diff --git a/plugins/jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java b/plugins/jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java index 5a8cb3f7c..8e63257c9 100644 --- a/plugins/jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java +++ b/plugins/jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java @@ -29,9 +29,9 @@ import org.jfree.chart.ChartFactory; import org.jfree.chart.JFreeChart; import org.jfree.data.general.DefaultPieDataset; -import javax.servlet.ServletOutputStream; -import javax.servlet.WriteListener; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.WriteListener; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONActionRedirectResult.java b/plugins/json/src/main/java/org/apache/struts2/json/JSONActionRedirectResult.java index de3c2e912..93f1b4d3a 100644 --- a/plugins/json/src/main/java/org/apache/struts2/json/JSONActionRedirectResult.java +++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONActionRedirectResult.java @@ -21,8 +21,8 @@ package org.apache.struts2.json; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.ServletActionContext; import org.apache.struts2.result.Redirectable; diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java b/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java index e92620f20..a4a496c0b 100644 --- a/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java +++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java @@ -35,8 +35,8 @@ import org.apache.struts2.json.rpc.RPCError; import org.apache.struts2.json.rpc.RPCErrorCode; import org.apache.struts2.json.rpc.RPCResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.beans.IntrospectionException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java b/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java index 2161ef0c1..e466b0cef 100644 --- a/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java +++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java @@ -32,8 +32,8 @@ import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsConstants; import org.apache.struts2.json.smd.SMDGenerator; -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.List; diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java b/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java index f8c5683d6..b07a13919 100644 --- a/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java +++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java @@ -37,8 +37,8 @@ import java.util.regex.Pattern; import java.util.zip.GZIPOutputStream; import java.util.Arrays; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.inject.Inject; diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java b/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java index 4e5938904..912a110b5 100644 --- a/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java +++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java @@ -28,8 +28,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.commons.text.StringEscapeUtils; import org.apache.struts2.ServletActionContext; -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.Collection; import java.util.List; diff --git a/plugins/json/src/main/java/org/apache/struts2/json/SerializationParams.java b/plugins/json/src/main/java/org/apache/struts2/json/SerializationParams.java index 210a68883..87b4ddc07 100644 --- a/plugins/json/src/main/java/org/apache/struts2/json/SerializationParams.java +++ b/plugins/json/src/main/java/org/apache/struts2/json/SerializationParams.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.json; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; diff --git a/plugins/json/src/main/java/org/apache/struts2/json/smd/SMDGenerator.java b/plugins/json/src/main/java/org/apache/struts2/json/smd/SMDGenerator.java index e1c3ce5a3..923fa5f3f 100644 --- a/plugins/json/src/main/java/org/apache/struts2/json/smd/SMDGenerator.java +++ b/plugins/json/src/main/java/org/apache/struts2/json/smd/SMDGenerator.java @@ -27,7 +27,7 @@ import org.apache.struts2.json.annotations.SMD; import org.apache.struts2.json.annotations.SMDMethod; import org.apache.struts2.json.annotations.SMDMethodParameter; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.List; diff --git a/plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java b/plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java index c346729eb..aaa446643 100644 --- a/plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java +++ b/plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java @@ -30,7 +30,7 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockServletContext; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.math.BigInteger; import java.text.SimpleDateFormat; diff --git a/plugins/json/src/test/java/org/apache/struts2/json/JSONValidationInterceptorTest.java b/plugins/json/src/test/java/org/apache/struts2/json/JSONValidationInterceptorTest.java index 8cf3dcef1..5c564b590 100644 --- a/plugins/json/src/test/java/org/apache/struts2/json/JSONValidationInterceptorTest.java +++ b/plugins/json/src/test/java/org/apache/struts2/json/JSONValidationInterceptorTest.java @@ -34,7 +34,7 @@ import org.apache.struts2.interceptor.validation.SkipValidation; import org.apache.struts2.junit.StrutsTestCase; import org.apache.struts2.junit.util.TestUtils; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.PrintWriter; import java.io.StringWriter; import java.util.HashMap; diff --git a/plugins/json/src/test/java/org/apache/struts2/json/StrutsMockHttpServletRequest.java b/plugins/json/src/test/java/org/apache/struts2/json/StrutsMockHttpServletRequest.java index b2d962b29..1118157e1 100644 --- a/plugins/json/src/test/java/org/apache/struts2/json/StrutsMockHttpServletRequest.java +++ b/plugins/json/src/test/java/org/apache/struts2/json/StrutsMockHttpServletRequest.java @@ -18,11 +18,11 @@ */ package org.apache.struts2.json; -import com.mockobjects.servlet.MockHttpServletRequest; +import org.springframework.mock.web.MockHttpServletRequest; import junit.framework.AssertionFailedError; -import javax.servlet.RequestDispatcher; -import javax.servlet.http.HttpSession; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpSession; import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; diff --git a/plugins/json/src/test/java/org/apache/struts2/json/StrutsMockHttpSession.java b/plugins/json/src/test/java/org/apache/struts2/json/StrutsMockHttpSession.java index 7d2998f23..177deee21 100644 --- a/plugins/json/src/test/java/org/apache/struts2/json/StrutsMockHttpSession.java +++ b/plugins/json/src/test/java/org/apache/struts2/json/StrutsMockHttpSession.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.json; -import com.mockobjects.servlet.MockHttpSession; +import org.springframework.mock.web.MockHttpSession; import java.util.Enumeration; import java.util.Hashtable; diff --git a/plugins/json/src/test/java/org/apache/struts2/json/StrutsMockServletContext.java b/plugins/json/src/test/java/org/apache/struts2/json/StrutsMockServletContext.java index 5927eb7f2..3526f0a90 100644 --- a/plugins/json/src/test/java/org/apache/struts2/json/StrutsMockServletContext.java +++ b/plugins/json/src/test/java/org/apache/struts2/json/StrutsMockServletContext.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.json; -import javax.servlet.*; -import javax.servlet.descriptor.JspConfigDescriptor; +import jakarta.servlet.*; +import jakarta.servlet.descriptor.JspConfigDescriptor; import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; diff --git a/plugins/junit/src/main/java/org/apache/struts2/junit/StrutsJUnit4TestCase.java b/plugins/junit/src/main/java/org/apache/struts2/junit/StrutsJUnit4TestCase.java index 84b76a1b6..ef2afef77 100644 --- a/plugins/junit/src/main/java/org/apache/struts2/junit/StrutsJUnit4TestCase.java +++ b/plugins/junit/src/main/java/org/apache/struts2/junit/StrutsJUnit4TestCase.java @@ -39,10 +39,10 @@ import org.springframework.mock.web.MockHttpSession; import org.springframework.mock.web.MockPageContext; import org.springframework.mock.web.MockServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.UnsupportedEncodingException; import java.util.Enumeration; import java.util.HashMap; diff --git a/plugins/junit/src/main/java/org/apache/struts2/junit/StrutsRestTestCase.java b/plugins/junit/src/main/java/org/apache/struts2/junit/StrutsRestTestCase.java index 80a954f8e..6f55eefde 100644 --- a/plugins/junit/src/main/java/org/apache/struts2/junit/StrutsRestTestCase.java +++ b/plugins/junit/src/main/java/org/apache/struts2/junit/StrutsRestTestCase.java @@ -31,8 +31,8 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockPageContext; import org.springframework.mock.web.MockServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; import java.util.HashMap; diff --git a/plugins/junit/src/main/java/org/apache/struts2/junit/StrutsTestCase.java b/plugins/junit/src/main/java/org/apache/struts2/junit/StrutsTestCase.java index f64a9966f..2b40f26a6 100644 --- a/plugins/junit/src/main/java/org/apache/struts2/junit/StrutsTestCase.java +++ b/plugins/junit/src/main/java/org/apache/struts2/junit/StrutsTestCase.java @@ -35,9 +35,9 @@ import org.springframework.mock.web.MockHttpSession; import org.springframework.mock.web.MockPageContext; import org.springframework.mock.web.MockServletContext; -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.UnsupportedEncodingException; import java.util.HashMap; import java.util.Map; diff --git a/plugins/junit/src/test/java/org/apache/struts2/junit/StrutsSpringJUnit4TestCaseTest.java b/plugins/junit/src/test/java/org/apache/struts2/junit/StrutsSpringJUnit4TestCaseTest.java index 0501b8882..2000ef0b5 100644 --- a/plugins/junit/src/test/java/org/apache/struts2/junit/StrutsSpringJUnit4TestCaseTest.java +++ b/plugins/junit/src/test/java/org/apache/struts2/junit/StrutsSpringJUnit4TestCaseTest.java @@ -27,7 +27,7 @@ import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import java.io.UnsupportedEncodingException; @RunWith(SpringJUnit4ClassRunner.class) diff --git a/plugins/junit/src/test/java/org/apache/struts2/junit/StrutsTestCaseTest.java b/plugins/junit/src/test/java/org/apache/struts2/junit/StrutsTestCaseTest.java index 1de57bb04..33f0ba5ee 100644 --- a/plugins/junit/src/test/java/org/apache/struts2/junit/StrutsTestCaseTest.java +++ b/plugins/junit/src/test/java/org/apache/struts2/junit/StrutsTestCaseTest.java @@ -22,7 +22,7 @@ import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionProxy; import org.apache.struts2.dispatcher.mapper.ActionMapping; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import java.io.UnsupportedEncodingException; public class StrutsTestCaseTest extends StrutsSpringTestCase { diff --git a/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleFreemarkerManager.java b/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleFreemarkerManager.java index 7e8728987..614cf2401 100644 --- a/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleFreemarkerManager.java +++ b/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleFreemarkerManager.java @@ -29,7 +29,7 @@ import org.apache.struts2.osgi.loaders.FreeMarkerBundleResourceLoader; import org.apache.struts2.views.freemarker.FreemarkerManager; import org.apache.struts2.views.freemarker.StrutsClassTemplateLoader; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.File; import java.io.IOException; import java.net.URI; diff --git a/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiConfigurationProvider.java b/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiConfigurationProvider.java index 61b22c281..b1061a204 100644 --- a/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiConfigurationProvider.java +++ b/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiConfigurationProvider.java @@ -39,7 +39,7 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.BundleEvent; import org.osgi.framework.BundleListener; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.util.HashMap; import java.util.HashSet; import java.util.Properties; diff --git a/plugins/osgi/src/main/java/org/apache/struts2/osgi/StrutsOsgiListener.java b/plugins/osgi/src/main/java/org/apache/struts2/osgi/StrutsOsgiListener.java index 21dc64b4c..91c26d30b 100644 --- a/plugins/osgi/src/main/java/org/apache/struts2/osgi/StrutsOsgiListener.java +++ b/plugins/osgi/src/main/java/org/apache/struts2/osgi/StrutsOsgiListener.java @@ -23,9 +23,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.struts2.StrutsException; import org.apache.struts2.osgi.host.OsgiHost; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; /** * ServletContextListener that starts OSGi host diff --git a/plugins/osgi/src/main/java/org/apache/struts2/osgi/host/BaseOsgiHost.java b/plugins/osgi/src/main/java/org/apache/struts2/osgi/host/BaseOsgiHost.java index 5dc469682..6262ab3b2 100644 --- a/plugins/osgi/src/main/java/org/apache/struts2/osgi/host/BaseOsgiHost.java +++ b/plugins/osgi/src/main/java/org/apache/struts2/osgi/host/BaseOsgiHost.java @@ -39,7 +39,7 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; import org.osgi.util.tracker.ServiceTracker; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.BufferedInputStream; import java.io.File; import java.io.FilenameFilter; diff --git a/plugins/osgi/src/main/java/org/apache/struts2/osgi/host/FelixOsgiHost.java b/plugins/osgi/src/main/java/org/apache/struts2/osgi/host/FelixOsgiHost.java index c640683ab..cff003e06 100644 --- a/plugins/osgi/src/main/java/org/apache/struts2/osgi/host/FelixOsgiHost.java +++ b/plugins/osgi/src/main/java/org/apache/struts2/osgi/host/FelixOsgiHost.java @@ -33,7 +33,7 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; import org.osgi.framework.ServiceReference; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.File; import java.util.Arrays; import java.util.Collections; diff --git a/plugins/osgi/src/main/java/org/apache/struts2/osgi/host/GlassfishOSGiHost.java b/plugins/osgi/src/main/java/org/apache/struts2/osgi/host/GlassfishOSGiHost.java index 2f339d740..0c350404c 100644 --- a/plugins/osgi/src/main/java/org/apache/struts2/osgi/host/GlassfishOSGiHost.java +++ b/plugins/osgi/src/main/java/org/apache/struts2/osgi/host/GlassfishOSGiHost.java @@ -26,7 +26,7 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; import org.osgi.framework.BundleReference; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.net.URL; import java.security.CodeSource; import java.security.ProtectionDomain; diff --git a/plugins/osgi/src/main/java/org/apache/struts2/osgi/host/OsgiHost.java b/plugins/osgi/src/main/java/org/apache/struts2/osgi/host/OsgiHost.java index 543a1652a..b0149ad8b 100644 --- a/plugins/osgi/src/main/java/org/apache/struts2/osgi/host/OsgiHost.java +++ b/plugins/osgi/src/main/java/org/apache/struts2/osgi/host/OsgiHost.java @@ -21,7 +21,7 @@ package org.apache.struts2.osgi.host; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.util.Map; /** diff --git a/plugins/osgi/src/main/java/org/apache/struts2/osgi/interceptor/OsgiInterceptor.java b/plugins/osgi/src/main/java/org/apache/struts2/osgi/interceptor/OsgiInterceptor.java index 7c19482ba..5ec67c034 100644 --- a/plugins/osgi/src/main/java/org/apache/struts2/osgi/interceptor/OsgiInterceptor.java +++ b/plugins/osgi/src/main/java/org/apache/struts2/osgi/interceptor/OsgiInterceptor.java @@ -28,7 +28,7 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/plugins/osgi/src/test/java/org/apache/struts2/osgi/interceptor/OsgiInterceptorTest.java b/plugins/osgi/src/test/java/org/apache/struts2/osgi/interceptor/OsgiInterceptorTest.java index e464d405e..a12ba4fdb 100644 --- a/plugins/osgi/src/test/java/org/apache/struts2/osgi/interceptor/OsgiInterceptorTest.java +++ b/plugins/osgi/src/test/java/org/apache/struts2/osgi/interceptor/OsgiInterceptorTest.java @@ -24,7 +24,7 @@ import org.apache.struts2.osgi.host.OsgiHost; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import com.opensymphony.xwork2.ActionInvocation; import junit.framework.TestCase; diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml index ad011b259..450a08905 100644 --- a/plugins/oval/pom.xml +++ b/plugins/oval/pom.xml @@ -50,8 +50,8 @@ - javax.persistence - persistence-api + jakarta.persistence + jakarta.persistence-api test diff --git a/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldJPAAnnotations.java b/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldJPAAnnotations.java index 8df5c55f1..a06ea76f1 100644 --- a/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldJPAAnnotations.java +++ b/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldJPAAnnotations.java @@ -20,7 +20,7 @@ package org.apache.struts2.oval.interceptor; import com.opensymphony.xwork2.ActionSupport; -import javax.persistence.Basic; +import jakarta.persistence.Basic; public class SimpleFieldJPAAnnotations extends ActionSupport { @Basic(optional = false) diff --git a/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/domain/Person.java b/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/domain/Person.java index ef6c0e0f4..b45b3f6d4 100644 --- a/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/domain/Person.java +++ b/plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/domain/Person.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.oval.interceptor.domain; -import javax.persistence.Column; +import jakarta.persistence.Column; import net.sf.oval.constraint.AssertValid; import net.sf.oval.constraint.NotNull; diff --git a/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java b/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java index d2db975d4..d8284f61b 100644 --- a/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java +++ b/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java @@ -22,7 +22,7 @@ import http.utils.multipartrequest.ServletMultipartRequest; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.ArrayList; diff --git a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java index 18a729fae..825033128 100644 --- a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java +++ b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java @@ -21,15 +21,15 @@ package org.apache.struts2.plexus; import java.io.IOException; import java.util.Collections; -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.HttpSession; +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.HttpSession; import org.codehaus.plexus.PlexusContainer; diff --git a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java index 9ba689b55..7a05c3c18 100644 --- a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java +++ b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java @@ -20,12 +20,12 @@ package org.apache.struts2.plexus; import java.util.Collections; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; import org.codehaus.plexus.DefaultPlexusContainer; import org.codehaus.plexus.PlexusContainer; diff --git a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java index 774380044..72c76f214 100644 --- a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java +++ b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java @@ -33,7 +33,7 @@ import com.opensymphony.xwork2.util.reflection.ReflectionProvider; import com.opensymphony.xwork2.validator.Validator; import org.codehaus.plexus.PlexusContainer; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.util.HashMap; import java.util.Map; diff --git a/plugins/pom.xml b/plugins/pom.xml index 04b024304..d735b3371 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -94,13 +94,13 @@ - javax.servlet.jsp - jsp-api + jakarta.servlet.jsp + jakarta.servlet.jsp-api provided - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided diff --git a/plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletRequest.java b/plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletRequest.java index 02ac4a3d9..ffa226e7c 100644 --- a/plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletRequest.java +++ b/plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletRequest.java @@ -33,7 +33,7 @@ import javax.portlet.PortletPreferences; import javax.portlet.PortletRequest; import javax.portlet.PortletSession; import javax.portlet.WindowState; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; diff --git a/plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletResponse.java b/plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletResponse.java index 1e69a5392..93978a6d5 100644 --- a/plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletResponse.java +++ b/plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletResponse.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import javax.portlet.PortalContext; import javax.portlet.PortletResponse; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; diff --git a/plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletSession.java b/plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletSession.java index d79a591f6..f1523bf95 100644 --- a/plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletSession.java +++ b/plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletSession.java @@ -23,8 +23,8 @@ import java.util.Iterator; import java.util.Map; import javax.portlet.PortletContext; import javax.portlet.PortletSession; -import javax.servlet.http.HttpSessionBindingEvent; -import javax.servlet.http.HttpSessionBindingListener; +import jakarta.servlet.http.HttpSessionBindingEvent; +import jakarta.servlet.http.HttpSessionBindingListener; import org.springframework.mock.web.MockHttpSession; diff --git a/plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/ServletWrappingPortletContext.java b/plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/ServletWrappingPortletContext.java index 70f8b86db..da179845e 100644 --- a/plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/ServletWrappingPortletContext.java +++ b/plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/ServletWrappingPortletContext.java @@ -24,7 +24,7 @@ import java.util.Enumeration; import java.util.Set; import javax.portlet.PortletContext; import javax.portlet.PortletRequestDispatcher; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.springframework.util.Assert; diff --git a/plugins/portlet-mocks/src/test/java/org/apache/struts2/StrutsSpringPortletMockObjectsTest.java b/plugins/portlet-mocks/src/test/java/org/apache/struts2/StrutsSpringPortletMockObjectsTest.java index 45ea12a74..019994d54 100644 --- a/plugins/portlet-mocks/src/test/java/org/apache/struts2/StrutsSpringPortletMockObjectsTest.java +++ b/plugins/portlet-mocks/src/test/java/org/apache/struts2/StrutsSpringPortletMockObjectsTest.java @@ -45,8 +45,8 @@ import javax.portlet.PreferencesValidator; import javax.portlet.ReadOnlyException; import javax.portlet.ResourceURL; import javax.portlet.WindowState; -import javax.security.auth.Subject; -import javax.servlet.http.Cookie; +import jakarta.security.auth.Subject; +import jakarta.servlet.http.Cookie; import javax.xml.namespace.QName; import junit.framework.TestCase; import org.apache.struts2.mock.web.portlet.MockActionRequest; diff --git a/plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java b/plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java index 53a6bf856..130c8f5f6 100644 --- a/plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java +++ b/plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java @@ -32,7 +32,7 @@ import javax.portlet.PortletContext; import javax.portlet.PortletException; import javax.portlet.PortletRequestDispatcher; import javax.portlet.PortletResponse; -import javax.servlet.ServletOutputStream; +import jakarta.servlet.ServletOutputStream; import java.io.IOException; import java.io.PrintWriter; import java.util.Locale; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DispatcherServlet.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DispatcherServlet.java index a09137a43..94127a192 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DispatcherServlet.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DispatcherServlet.java @@ -22,10 +22,10 @@ import org.apache.commons.lang3.StringUtils; import org.apache.struts2.dispatcher.StrutsRequestWrapper; import org.apache.struts2.portlet.PortletConstants; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; public class DispatcherServlet extends HttpServlet { diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java index 394ef6042..d728e3e35 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java @@ -62,9 +62,9 @@ import javax.portlet.PortletResponse; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; import javax.portlet.WindowState; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Enumeration; import java.util.HashMap; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java index 19122206b..06dd8a898 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java @@ -21,7 +21,7 @@ package org.apache.struts2.portlet.interceptor; import org.apache.struts2.interceptor.PrincipalProxy; import javax.portlet.PortletRequest; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.security.Principal; /** diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java index 5e97b00dd..b0bc5db38 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java @@ -36,10 +36,10 @@ import javax.portlet.PortletRequest; import javax.portlet.PortletRequestDispatcher; import javax.portlet.PortletResponse; import javax.portlet.RenderResponse; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; import java.util.StringTokenizer; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java index fcae67c45..d4d795b28 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java @@ -37,12 +37,12 @@ import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.context.Context; import javax.portlet.ActionResponse; -import javax.servlet.Servlet; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.JspFactory; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.JspFactory; +import jakarta.servlet.jsp.PageContext; import java.io.OutputStreamWriter; import java.io.Writer; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletHttpSession.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletHttpSession.java index 75f944a55..07deeb951 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletHttpSession.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletHttpSession.java @@ -23,9 +23,8 @@ import java.util.Enumeration; import java.util.List; import javax.portlet.PortletSession; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionContext; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; /** * Wrapper object exposing a {@link PortletSession} as a {@link HttpSession} instance. @@ -103,15 +102,6 @@ public class PortletHttpSession implements HttpSession { return new PortletServletContext(portletSession.getPortletContext()); } - /** - * @see javax.servlet.http.HttpSession#getSessionContext() - * @throws IllegalStateException - * Not supported in a portlet. - */ - public HttpSessionContext getSessionContext() { - throw new IllegalStateException("Not supported in a portlet"); - } - /* * (non-Javadoc) * diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletConfig.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletConfig.java index 3bc21a9f6..5a3b55378 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletConfig.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletConfig.java @@ -22,8 +22,8 @@ import java.util.Enumeration; import javax.portlet.PortletConfig; import javax.portlet.PortletContext; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; /** * Wrapper object exposing a {@link PortletConfig} as a {@link ServletConfig} instance. diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletContext.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletContext.java index f52ba4dc6..84f620d81 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletContext.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletContext.java @@ -20,16 +20,16 @@ package org.apache.struts2.portlet.servlet; import javax.portlet.PortletContext; import javax.portlet.PortletRequestDispatcher; -import javax.servlet.Filter; -import javax.servlet.FilterRegistration; -import javax.servlet.RequestDispatcher; -import javax.servlet.Servlet; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRegistration; -import javax.servlet.SessionCookieConfig; -import javax.servlet.SessionTrackingMode; -import javax.servlet.descriptor.JspConfigDescriptor; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterRegistration; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRegistration; +import jakarta.servlet.SessionCookieConfig; +import jakarta.servlet.SessionTrackingMode; +import jakarta.servlet.descriptor.JspConfigDescriptor; import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletInputStream.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletInputStream.java index 510248b3e..1bad86836 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletInputStream.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletInputStream.java @@ -21,8 +21,8 @@ package org.apache.struts2.portlet.servlet; import java.io.IOException; import java.io.InputStream; -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletInputStream; /** * Wrapper object exposing a {@link InputStream} from a portlet as a {@link ServletInputStream} instance. diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletOutputStream.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletOutputStream.java index 6a297d743..c43e058eb 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletOutputStream.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletOutputStream.java @@ -21,8 +21,8 @@ package org.apache.struts2.portlet.servlet; import java.io.IOException; import java.io.OutputStream; -import javax.servlet.ServletOutputStream; -import javax.servlet.WriteListener; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.WriteListener; /** * Wrapper object exposing a {@link OutputStream} from a portlet as a {@link ServletOutputStream} instance. diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequest.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequest.java index a6049e940..3ea0e0050 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequest.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequest.java @@ -35,20 +35,20 @@ import javax.portlet.PortletContext; import javax.portlet.PortletRequest; import javax.portlet.PortletRequestDispatcher; import javax.portlet.PortletSession; -import javax.servlet.AsyncContext; -import javax.servlet.DispatcherType; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpUpgradeHandler; -import javax.servlet.http.Part; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpUpgradeHandler; +import jakarta.servlet.http.Part; import static org.apache.struts2.portlet.PortletConstants.*; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequestDispatcher.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequestDispatcher.java index 934cf2497..1bfc00d68 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequestDispatcher.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequestDispatcher.java @@ -26,10 +26,10 @@ import javax.portlet.PortletRequestDispatcher; import javax.portlet.PortletResponse; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; public class PortletServletRequestDispatcher implements RequestDispatcher { diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponse.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponse.java index e5c76f9ab..ce40946f5 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponse.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponse.java @@ -25,9 +25,9 @@ import java.util.Locale; import javax.portlet.PortletResponse; import javax.portlet.RenderResponse; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; public class PortletServletResponse implements HttpServletResponse { diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java index fd62be36c..a2e028568 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java @@ -25,7 +25,7 @@ import java.util.Locale; import javax.portlet.MimeResponse; import javax.portlet.PortletResponse; import javax.portlet.ResourceResponse; -import javax.servlet.ServletOutputStream; +import jakarta.servlet.ServletOutputStream; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java b/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java index ed75bd8ba..f58c0fd93 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java @@ -37,9 +37,9 @@ import org.apache.struts2.views.util.ResourceUtil; import javax.portlet.ActionResponse; import javax.portlet.PortletException; import javax.portlet.ResourceResponse; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.Writer; import java.util.Locale; diff --git a/plugins/portlet/src/test/java/org/apache/struts2/StrutsTestCasePortletTests.java b/plugins/portlet/src/test/java/org/apache/struts2/StrutsTestCasePortletTests.java index acea0bec3..68993e445 100644 --- a/plugins/portlet/src/test/java/org/apache/struts2/StrutsTestCasePortletTests.java +++ b/plugins/portlet/src/test/java/org/apache/struts2/StrutsTestCasePortletTests.java @@ -26,9 +26,9 @@ import com.opensymphony.xwork2.config.Configuration; import java.io.UnsupportedEncodingException; import java.util.HashMap; import java.util.Map; -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 org.apache.struts2.dispatcher.Dispatcher; import org.apache.struts2.dispatcher.HttpParameters; import org.apache.struts2.dispatcher.mapper.ActionMapper; diff --git a/plugins/portlet/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java b/plugins/portlet/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java index 9beef5d45..f8e57b7b2 100644 --- a/plugins/portlet/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java +++ b/plugins/portlet/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java @@ -40,10 +40,10 @@ import javax.portlet.PortletURL; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; import javax.portlet.WindowState; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.PageContext; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java b/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java index 4a93320b4..7a4357e7d 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java @@ -21,8 +21,8 @@ package org.apache.struts2.rest; import com.opensymphony.xwork2.ActionInvocation; import org.apache.struts2.rest.handler.ContentTypeHandler; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.opensymphony.xwork2.config.entities.ActionConfig; diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java b/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java index 40924fc5a..7d71066b0 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java @@ -25,7 +25,7 @@ import com.opensymphony.xwork2.interceptor.AbstractInterceptor; import org.apache.struts2.ServletActionContext; import org.apache.struts2.rest.handler.ContentTypeHandler; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultContentTypeHandlerManager.java b/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultContentTypeHandlerManager.java index c2c89f544..6ee84d35f 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultContentTypeHandlerManager.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultContentTypeHandlerManager.java @@ -27,8 +27,8 @@ import org.apache.logging.log4j.Logger; import org.apache.struts2.ServletActionContext; import org.apache.struts2.rest.handler.ContentTypeHandler; -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.io.StringWriter; import java.util.HashMap; diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java b/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java index 5b4ae79a0..530e820d1 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java @@ -20,11 +20,11 @@ package org.apache.struts2.rest; import org.apache.struts2.RequestUtils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Date; -import static javax.servlet.http.HttpServletResponse.*; +import static jakarta.servlet.http.HttpServletResponse.*; /** * Default implementation of rest info that uses fluent-style construction diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/HttpHeaders.java b/plugins/rest/src/main/java/org/apache/struts2/rest/HttpHeaders.java index 0bb1cce9e..58a9adc0f 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/HttpHeaders.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/HttpHeaders.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.rest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Type-safe rest-related information to apply to a response diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java index 286c80db1..850bdfc4f 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java @@ -32,8 +32,8 @@ import org.apache.struts2.result.HttpHeaderResult; import org.apache.struts2.rest.handler.ContentTypeHandler; import org.apache.struts2.rest.handler.HtmlHandler; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.Map; diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java index eec8bf37e..48f4e5fb0 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java @@ -30,7 +30,7 @@ import org.apache.struts2.StrutsConstants; import org.apache.struts2.dispatcher.mapper.ActionMapping; import org.apache.struts2.dispatcher.mapper.DefaultActionMapper; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.HashMap; /** diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionSupport.java b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionSupport.java index 6b9f67139..6d271ebc0 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionSupport.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionSupport.java @@ -20,8 +20,8 @@ package org.apache.struts2.rest; import java.lang.reflect.Method; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.ServletActionContext; diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java b/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java index 6a981c8e5..54220c647 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java @@ -31,7 +31,7 @@ import org.apache.struts2.dispatcher.mapper.ActionMapping; import java.util.HashMap; import java.util.Map; -import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; +import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST; /** * An interceptor that makes sure there are not validation errors before allowing the interceptor chain to continue. diff --git a/plugins/rest/src/test/java/org/apache/struts2/rest/ContentTypeHandlerManagerTest.java b/plugins/rest/src/test/java/org/apache/struts2/rest/ContentTypeHandlerManagerTest.java index 8522668c9..0ef4323e8 100644 --- a/plugins/rest/src/test/java/org/apache/struts2/rest/ContentTypeHandlerManagerTest.java +++ b/plugins/rest/src/test/java/org/apache/struts2/rest/ContentTypeHandlerManagerTest.java @@ -42,8 +42,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import static javax.servlet.http.HttpServletResponse.SC_NOT_MODIFIED; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_NOT_MODIFIED; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; public class ContentTypeHandlerManagerTest extends TestCase { diff --git a/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java b/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java index f23d014d5..09e80982d 100644 --- a/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java +++ b/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java @@ -27,7 +27,7 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; -import static javax.servlet.http.HttpServletResponse.*; +import static jakarta.servlet.http.HttpServletResponse.*; public class DefaultHttpHeadersTest extends TestCase { diff --git a/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionInvocationTest.java b/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionInvocationTest.java index 8e83dc155..9c5a7de64 100644 --- a/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionInvocationTest.java +++ b/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionInvocationTest.java @@ -36,13 +36,13 @@ import org.apache.struts2.result.HttpHeaderResult; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import static javax.servlet.http.HttpServletResponse.SC_NOT_MODIFIED; +import static jakarta.servlet.http.HttpServletResponse.SC_NOT_MODIFIED; public class RestActionInvocationTest extends TestCase { diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java index b6bd1ac74..2832d4c5b 100644 --- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java +++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java @@ -37,10 +37,10 @@ import org.apache.struts2.dispatcher.listener.StrutsListener; import org.apache.struts2.views.freemarker.FreemarkerManager; import org.apache.struts2.views.freemarker.ScopesHashModel; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.FileNotFoundException; import java.io.IOException; import java.io.StringWriter; diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerMapper2DecoratorSelector.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerMapper2DecoratorSelector.java index a52089fd5..ccad3c4e8 100644 --- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerMapper2DecoratorSelector.java +++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerMapper2DecoratorSelector.java @@ -26,7 +26,7 @@ import com.opensymphony.sitemesh.compatability.Content2HTMLPage; import com.opensymphony.sitemesh.webapp.SiteMeshWebAppContext; import com.opensymphony.sitemesh.webapp.decorator.NoDecorator; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Returns a {@link OldDecorator2NewStrutsFreemarkerDecorator} decorator diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerPageFilter.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerPageFilter.java index e405d727d..d938aab10 100644 --- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerPageFilter.java +++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerPageFilter.java @@ -26,8 +26,8 @@ import com.opensymphony.sitemesh.webapp.SiteMeshWebAppContext; import com.opensymphony.xwork2.inject.Inject; import org.apache.struts2.views.freemarker.FreemarkerManager; -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletContext; /** * Core Filter for integrating SiteMesh + Freemarker into diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/NoneDecoratorMapper.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/NoneDecoratorMapper.java index e111487b4..515cf30a2 100644 --- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/NoneDecoratorMapper.java +++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/NoneDecoratorMapper.java @@ -22,7 +22,7 @@ import com.opensymphony.module.sitemesh.mapper.AbstractDecoratorMapper; import com.opensymphony.module.sitemesh.Decorator; import com.opensymphony.module.sitemesh.Page; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Won't decorate the output if it finds a "decorator" flag in the request diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsDecorator.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsDecorator.java index f5a0cd1a8..e435ccc0d 100644 --- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsDecorator.java +++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsDecorator.java @@ -30,10 +30,10 @@ import freemarker.template.Configuration; import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.Dispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Locale; diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsFreemarkerDecorator.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsFreemarkerDecorator.java index ec792bad0..6e68e1e54 100644 --- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsFreemarkerDecorator.java +++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsFreemarkerDecorator.java @@ -30,10 +30,10 @@ import freemarker.template.Template; import org.apache.struts2.views.freemarker.FreemarkerManager; import org.apache.struts2.views.freemarker.ScopesHashModel; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java index cd0417364..57564f47e 100644 --- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java +++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java @@ -28,10 +28,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.struts2.views.velocity.VelocityManager; import org.apache.velocity.context.Context; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java index 4859c4f59..56af9c61a 100644 --- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java +++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java @@ -36,10 +36,10 @@ import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.tools.view.VelocityView; import org.apache.velocity.tools.view.VelocityViewServlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.StringWriter; diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityMapper2DecoratorSelector.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityMapper2DecoratorSelector.java index 8bea9136a..5d0ef6a6f 100644 --- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityMapper2DecoratorSelector.java +++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityMapper2DecoratorSelector.java @@ -27,7 +27,7 @@ import com.opensymphony.sitemesh.compatability.Content2HTMLPage; import com.opensymphony.sitemesh.webapp.SiteMeshWebAppContext; import com.opensymphony.sitemesh.webapp.decorator.NoDecorator; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Returns a {@link OldDecorator2NewStrutsVelocityDecorator} decorator diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java index 22de2c60a..fa309ea27 100644 --- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java +++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java @@ -25,7 +25,7 @@ import com.opensymphony.module.sitemesh.Factory; import com.opensymphony.module.sitemesh.Config; import com.opensymphony.xwork2.inject.Inject; -import javax.servlet.*; +import jakarta.servlet.*; import org.apache.struts2.views.velocity.VelocityManager; diff --git a/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java b/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java index 4235a67d7..424ef8d7c 100644 --- a/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java +++ b/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java @@ -33,7 +33,7 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.BeansException; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.File; import java.util.List; import java.util.ArrayList; diff --git a/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java b/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java index ed999360c..2b99cb483 100644 --- a/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java +++ b/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java @@ -30,7 +30,7 @@ import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.web.context.WebApplicationContext; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; /** *

diff --git a/plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java b/plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java index 5a3def2c9..bda014945 100644 --- a/plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java +++ b/plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java @@ -27,7 +27,7 @@ import org.springframework.web.context.ConfigurableWebApplicationContext; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.XmlWebApplicationContext; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; /** * Unit test for {@link StrutsSpringObjectFactory}. diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml index 440f6ee79..1a05d13e3 100644 --- a/plugins/tiles/pom.xml +++ b/plugins/tiles/pom.xml @@ -71,8 +71,8 @@ commons-digester3 - org.glassfish - javax.el + org.glassfish + jakarta.el true diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java index e566f5747..e3d87fe86 100644 --- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java +++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java @@ -29,7 +29,7 @@ import org.apache.tiles.core.evaluator.AbstractAttributeEvaluator; import org.apache.tiles.request.Request; import org.apache.tiles.request.servlet.ServletUtil; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public class I18NAttributeEvaluator extends AbstractAttributeEvaluator { diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsAttributeEvaluator.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsAttributeEvaluator.java index 7b3e7624f..8bf1c1df2 100644 --- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsAttributeEvaluator.java +++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsAttributeEvaluator.java @@ -30,7 +30,7 @@ import org.apache.tiles.core.evaluator.EvaluationException; import org.apache.tiles.request.Request; import org.apache.tiles.request.servlet.ServletUtil; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public class StrutsAttributeEvaluator extends AbstractAttributeEvaluator { diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java index e39fed4c6..88ba5b6ae 100644 --- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java +++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java @@ -38,8 +38,8 @@ import org.apache.tiles.request.render.Renderer; import org.apache.tiles.core.impl.InvalidTemplateException; import org.apache.tiles.request.servlet.ServletUtil; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; public class StrutsFreeMarkerAttributeRenderer implements Renderer { diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java index 205476467..8ef7cc561 100644 --- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java +++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java @@ -59,14 +59,14 @@ import org.apache.tiles.ognl.TilesApplicationContextNestedObjectExtractor; import org.apache.tiles.ognl.TilesContextPropertyAccessorDelegateFactory; import org.apache.tiles.request.render.Renderer; -import javax.el.ArrayELResolver; -import javax.el.BeanELResolver; -import javax.el.CompositeELResolver; -import javax.el.ELResolver; -import javax.el.ListELResolver; -import javax.el.MapELResolver; -import javax.el.ResourceBundleELResolver; -import javax.servlet.jsp.JspFactory; +import jakarta.el.ArrayELResolver; +import jakarta.el.BeanELResolver; +import jakarta.el.CompositeELResolver; +import jakarta.el.ELResolver; +import jakarta.el.ListELResolver; +import jakarta.el.MapELResolver; +import jakarta.el.ResourceBundleELResolver; +import jakarta.servlet.jsp.JspFactory; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesInitializer.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesInitializer.java index cb471a1ab..03c1ebd8c 100644 --- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesInitializer.java +++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesInitializer.java @@ -26,7 +26,7 @@ import org.apache.tiles.core.startup.AbstractTilesInitializer; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.servlet.ServletApplicationContext; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; public class StrutsTilesInitializer extends AbstractTilesInitializer { diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java index 0d3d3ec33..4e3ce5934 100644 --- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java +++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java @@ -28,7 +28,7 @@ import org.apache.tiles.core.locale.LocaleResolver; import org.apache.tiles.request.Request; import org.apache.tiles.request.servlet.ServletUtil; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Locale; public class StrutsTilesLocaleResolver implements LocaleResolver { diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java index 7af6069bb..814850d77 100644 --- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java +++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java @@ -26,7 +26,7 @@ import org.apache.logging.log4j.Logger; import org.apache.tiles.request.ApplicationResource; import org.apache.tiles.request.servlet.ServletApplicationContext; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.File; import java.io.IOException; import java.net.MalformedURLException; diff --git a/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java b/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java index 3ca20e4c1..baaaf88d8 100644 --- a/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java +++ b/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.views.tiles; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java b/plugins/tiles/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java index cfa68da8a..fbcd70b90 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java @@ -22,9 +22,9 @@ import org.apache.tiles.core.evaluator.AbstractAttributeEvaluator; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.Request; -import javax.el.ELResolver; -import javax.el.ExpressionFactory; -import javax.el.ValueExpression; +import jakarta.el.ELResolver; +import jakarta.el.ExpressionFactory; +import jakarta.el.ValueExpression; /** * Evaluates string expression with typical EL syntax.
diff --git a/plugins/tiles/src/main/java/org/apache/tiles/el/ELContextImpl.java b/plugins/tiles/src/main/java/org/apache/tiles/el/ELContextImpl.java index 8e162ae40..fe630f54c 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/el/ELContextImpl.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/el/ELContextImpl.java @@ -19,11 +19,11 @@ package org.apache.tiles.el; -import javax.el.ELContext; -import javax.el.ELResolver; -import javax.el.FunctionMapper; -import javax.el.ValueExpression; -import javax.el.VariableMapper; +import jakarta.el.ELContext; +import jakarta.el.ELResolver; +import jakarta.el.FunctionMapper; +import jakarta.el.ValueExpression; +import jakarta.el.VariableMapper; import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/el/ExpressionFactoryFactory.java b/plugins/tiles/src/main/java/org/apache/tiles/el/ExpressionFactoryFactory.java index f19a9e0e8..5218135ca 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/el/ExpressionFactoryFactory.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/el/ExpressionFactoryFactory.java @@ -18,7 +18,7 @@ */ package org.apache.tiles.el; -import javax.el.ExpressionFactory; +import jakarta.el.ExpressionFactory; /** * Interface to define a factory of {@link ExpressionFactory}. diff --git a/plugins/tiles/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java b/plugins/tiles/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java index 5b9bd108b..92061e29c 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java @@ -21,9 +21,9 @@ package org.apache.tiles.el; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.ApplicationContextAware; -import javax.el.ExpressionFactory; -import javax.servlet.ServletContext; -import javax.servlet.jsp.JspFactory; +import jakarta.el.ExpressionFactory; +import jakarta.servlet.ServletContext; +import jakarta.servlet.jsp.JspFactory; /** * Uses the JSP 2.1 {@link ExpressionFactory} to be used in Tiles. diff --git a/plugins/tiles/src/main/java/org/apache/tiles/el/ScopeELResolver.java b/plugins/tiles/src/main/java/org/apache/tiles/el/ScopeELResolver.java index 8086e113a..bb34179ba 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/el/ScopeELResolver.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/el/ScopeELResolver.java @@ -20,8 +20,8 @@ package org.apache.tiles.el; import org.apache.tiles.request.Request; -import javax.el.ELContext; -import javax.el.ELResolver; +import jakarta.el.ELContext; +import jakarta.el.ELResolver; import java.beans.FeatureDescriptor; import java.util.ArrayList; import java.util.Collections; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java b/plugins/tiles/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java index 117b4e614..8412b0574 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java @@ -20,8 +20,8 @@ package org.apache.tiles.el; import org.apache.tiles.request.Request; -import javax.el.ELContext; -import javax.el.ELResolver; +import jakarta.el.ELContext; +import jakarta.el.ELResolver; import java.beans.FeatureDescriptor; import java.util.ArrayList; import java.util.Iterator; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/el/TilesContextELResolver.java b/plugins/tiles/src/main/java/org/apache/tiles/el/TilesContextELResolver.java index 1296c5c34..3fc6738b6 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/el/TilesContextELResolver.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/el/TilesContextELResolver.java @@ -22,8 +22,8 @@ import org.apache.tiles.core.util.CombinedBeanInfo; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.Request; -import javax.el.ELContext; -import javax.el.ELResolver; +import jakarta.el.ELContext; +import jakarta.el.ELResolver; import java.beans.FeatureDescriptor; import java.util.Iterator; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java b/plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java index cd82fccb0..fdb57458a 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java @@ -26,8 +26,8 @@ import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.DispatchRequest; import org.apache.tiles.request.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.PrintWriter; import java.io.Writer; import java.util.ArrayList; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/servlet/WebappClassTemplateLoader.java b/plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/servlet/WebappClassTemplateLoader.java index 5103903a5..f3bbbb881 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/servlet/WebappClassTemplateLoader.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/servlet/WebappClassTemplateLoader.java @@ -23,7 +23,7 @@ import freemarker.cache.ClassTemplateLoader; import freemarker.cache.TemplateLoader; import freemarker.cache.WebappTemplateLoader; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.IOException; import java.io.Reader; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/JspPrintWriterAdapter.java b/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/JspPrintWriterAdapter.java index a7b2e2629..aa2045563 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/JspPrintWriterAdapter.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/JspPrintWriterAdapter.java @@ -21,7 +21,7 @@ package org.apache.tiles.request.jsp; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.JspWriter; import java.io.IOException; import java.io.PrintWriter; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/JspRequest.java b/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/JspRequest.java index 7e94e331e..445fc7a7f 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/JspRequest.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/JspRequest.java @@ -27,10 +27,10 @@ import org.apache.tiles.request.jsp.extractor.SessionScopeExtractor; import org.apache.tiles.request.servlet.ServletRequest; import org.apache.tiles.request.servlet.ServletUtil; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.PageContext; import java.io.IOException; import java.io.PrintWriter; import java.io.Writer; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/JspUtil.java b/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/JspUtil.java index 0a79145a0..01fb7ecf2 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/JspUtil.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/JspUtil.java @@ -21,8 +21,8 @@ package org.apache.tiles.request.jsp; import org.apache.tiles.request.ApplicationAccess; import org.apache.tiles.request.ApplicationContext; -import javax.servlet.jsp.JspContext; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.jsp.JspContext; +import jakarta.servlet.jsp.PageContext; /** * JSP utilities for JSP requests and related. diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntime.java b/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntime.java index ac15efa7e..7512082d3 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntime.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntime.java @@ -23,9 +23,9 @@ import org.apache.tiles.autotag.core.runtime.ModelBody; import org.apache.tiles.request.Request; import org.apache.tiles.request.jsp.JspRequest; -import javax.servlet.jsp.JspContext; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspContext; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; /** * A Runtime for implementing JSP tag libraries. diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/autotag/JspModelBody.java b/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/autotag/JspModelBody.java index ad9721575..8995fec16 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/autotag/JspModelBody.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/autotag/JspModelBody.java @@ -20,9 +20,9 @@ package org.apache.tiles.request.jsp.autotag; import org.apache.tiles.autotag.core.runtime.AbstractModelBody; -import javax.servlet.jsp.JspContext; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.JspFragment; +import jakarta.servlet.jsp.JspContext; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.JspFragment; import java.io.IOException; import java.io.Writer; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/extractor/ScopeExtractor.java b/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/extractor/ScopeExtractor.java index e3485226a..c20ae7f12 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/extractor/ScopeExtractor.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/extractor/ScopeExtractor.java @@ -20,7 +20,7 @@ package org.apache.tiles.request.jsp.extractor; import org.apache.tiles.request.attribute.AttributeExtractor; -import javax.servlet.jsp.JspContext; +import jakarta.servlet.jsp.JspContext; import java.util.Enumeration; /** diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/extractor/SessionScopeExtractor.java b/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/extractor/SessionScopeExtractor.java index 73eec8df1..57f058178 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/extractor/SessionScopeExtractor.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/jsp/extractor/SessionScopeExtractor.java @@ -20,7 +20,7 @@ package org.apache.tiles.request.jsp.extractor; import org.apache.tiles.request.attribute.AttributeExtractor; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.jsp.PageContext; import java.util.Enumeration; /** diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponse.java b/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponse.java index 492530e7e..7e0318ca2 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponse.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponse.java @@ -23,8 +23,8 @@ package org.apache.tiles.request.servlet; import java.io.PrintWriter; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; /** * Wraps an HTTP response and overrides its print writer. diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/ServletApplicationContext.java b/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/ServletApplicationContext.java index 27f2b0e63..5cf8e7cd4 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/ServletApplicationContext.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/ServletApplicationContext.java @@ -26,7 +26,7 @@ import org.apache.tiles.request.locale.URLApplicationResource; import org.apache.tiles.request.servlet.extractor.ApplicationScopeExtractor; import org.apache.tiles.request.servlet.extractor.InitParameterExtractor; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java b/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java index a21a025d4..500c17178 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java @@ -29,10 +29,10 @@ import org.apache.tiles.request.servlet.extractor.ParameterExtractor; import org.apache.tiles.request.servlet.extractor.RequestScopeExtractor; import org.apache.tiles.request.servlet.extractor.SessionScopeExtractor; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java b/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java index 0646774b0..dfef0b512 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java @@ -24,8 +24,8 @@ import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.Request; import org.apache.tiles.request.RequestWrapper; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; import java.io.IOException; /** diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/ApplicationScopeExtractor.java b/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/ApplicationScopeExtractor.java index 52af00a9c..2f11ae9b0 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/ApplicationScopeExtractor.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/ApplicationScopeExtractor.java @@ -20,7 +20,7 @@ package org.apache.tiles.request.servlet.extractor; import org.apache.tiles.request.attribute.AttributeExtractor; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.util.Enumeration; /** diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/HeaderExtractor.java b/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/HeaderExtractor.java index e7c366238..5e359cfc5 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/HeaderExtractor.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/HeaderExtractor.java @@ -20,8 +20,8 @@ package org.apache.tiles.request.servlet.extractor; import org.apache.tiles.request.attribute.EnumeratedValuesExtractor; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Enumeration; /** diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/InitParameterExtractor.java b/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/InitParameterExtractor.java index 6c67aaed9..cf95cd231 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/InitParameterExtractor.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/InitParameterExtractor.java @@ -20,7 +20,7 @@ package org.apache.tiles.request.servlet.extractor; import org.apache.tiles.request.attribute.HasKeys; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.util.Enumeration; /** diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/ParameterExtractor.java b/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/ParameterExtractor.java index 6925d253f..17c89301a 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/ParameterExtractor.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/ParameterExtractor.java @@ -20,7 +20,7 @@ package org.apache.tiles.request.servlet.extractor; import org.apache.tiles.request.attribute.HasKeys; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Enumeration; /** diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/RequestScopeExtractor.java b/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/RequestScopeExtractor.java index 8bb3682e8..ebaf1cf07 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/RequestScopeExtractor.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/RequestScopeExtractor.java @@ -20,7 +20,7 @@ package org.apache.tiles.request.servlet.extractor; import org.apache.tiles.request.attribute.AttributeExtractor; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Enumeration; /** diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractor.java b/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractor.java index 3753d9f2b..3b0bb01bd 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractor.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractor.java @@ -20,8 +20,8 @@ package org.apache.tiles.request.servlet.extractor; import org.apache.tiles.request.attribute.AttributeExtractor; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import java.util.Collections; import java.util.Enumeration; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java b/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java index 328d67c9e..1a7eba0b7 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java @@ -27,10 +27,10 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.tiles.request.AbstractViewRequest; import org.apache.tiles.request.ApplicationContext; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntime.java b/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntime.java index 32e00e745..00d00e545 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntime.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntime.java @@ -21,9 +21,9 @@ package org.apache.tiles.request.velocity.autotag; import java.io.Writer; import java.util.Map; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.tiles.autotag.core.runtime.AutotagRuntime; import org.apache.tiles.autotag.core.runtime.ModelBody; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java b/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java index 9810ce3d9..aff6c64f8 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java @@ -23,7 +23,7 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Map; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.servlet.ServletUtil; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderable.java b/plugins/tiles/src/main/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderable.java index 3628833bb..7498bb5d2 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderable.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderable.java @@ -23,8 +23,8 @@ import java.io.IOException; import java.io.StringWriter; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.tiles.velocity.TilesVelocityException; import org.apache.velocity.context.Context; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/velocity/template/ContextHolder.java b/plugins/tiles/src/main/java/org/apache/tiles/velocity/template/ContextHolder.java index ad43f3941..3afd40c3d 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/velocity/template/ContextHolder.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/velocity/template/ContextHolder.java @@ -19,9 +19,9 @@ package org.apache.tiles.velocity.template; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.velocity.context.Context; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java b/plugins/tiles/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java index e9c3852ac..facaa3bce 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java @@ -22,7 +22,7 @@ package org.apache.tiles.velocity.template; import java.io.IOException; import java.io.Writer; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.apache.tiles.api.Attribute; import org.apache.tiles.api.AttributeContext; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/AddAttributeTag.java b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/AddAttributeTag.java index 53c42cef2..27c3c590e 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/AddAttributeTag.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/AddAttributeTag.java @@ -23,8 +23,8 @@ package org.apache.tiles.web.jsp.taglib; import java.io.IOException; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import org.apache.tiles.autotag.core.runtime.ModelBody; import org.apache.tiles.autotag.core.runtime.AutotagRuntime; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/AddListAttributeTag.java b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/AddListAttributeTag.java index 0dc5c9fde..aa91cc674 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/AddListAttributeTag.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/AddListAttributeTag.java @@ -23,8 +23,8 @@ package org.apache.tiles.web.jsp.taglib; import java.io.IOException; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import org.apache.tiles.autotag.core.runtime.ModelBody; import org.apache.tiles.autotag.core.runtime.AutotagRuntime; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/DefinitionTag.java b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/DefinitionTag.java index eac32da5a..1f05ba60f 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/DefinitionTag.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/DefinitionTag.java @@ -23,8 +23,8 @@ package org.apache.tiles.web.jsp.taglib; import java.io.IOException; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import org.apache.tiles.autotag.core.runtime.ModelBody; import org.apache.tiles.autotag.core.runtime.AutotagRuntime; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/GetAsStringTag.java b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/GetAsStringTag.java index e34a1efc1..8f415971a 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/GetAsStringTag.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/GetAsStringTag.java @@ -23,8 +23,8 @@ package org.apache.tiles.web.jsp.taglib; import java.io.IOException; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import org.apache.tiles.autotag.core.runtime.ModelBody; import org.apache.tiles.autotag.core.runtime.AutotagRuntime; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/ImportAttributeTag.java b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/ImportAttributeTag.java index 56ca370e4..4ea89e06d 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/ImportAttributeTag.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/ImportAttributeTag.java @@ -23,8 +23,8 @@ package org.apache.tiles.web.jsp.taglib; import java.io.IOException; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import org.apache.tiles.autotag.core.runtime.AutotagRuntime; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/InsertAttributeTag.java b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/InsertAttributeTag.java index be288e864..1a3e5fdea 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/InsertAttributeTag.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/InsertAttributeTag.java @@ -23,8 +23,8 @@ package org.apache.tiles.web.jsp.taglib; import java.io.IOException; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import org.apache.tiles.autotag.core.runtime.ModelBody; import org.apache.tiles.autotag.core.runtime.AutotagRuntime; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/InsertDefinitionTag.java b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/InsertDefinitionTag.java index 0beec1aa1..af67de8c0 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/InsertDefinitionTag.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/InsertDefinitionTag.java @@ -23,8 +23,8 @@ package org.apache.tiles.web.jsp.taglib; import java.io.IOException; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import org.apache.tiles.autotag.core.runtime.ModelBody; import org.apache.tiles.autotag.core.runtime.AutotagRuntime; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/InsertTemplateTag.java b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/InsertTemplateTag.java index afe633881..4f92577c2 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/InsertTemplateTag.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/InsertTemplateTag.java @@ -23,8 +23,8 @@ package org.apache.tiles.web.jsp.taglib; import java.io.IOException; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import org.apache.tiles.autotag.core.runtime.ModelBody; import org.apache.tiles.autotag.core.runtime.AutotagRuntime; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/PutAttributeTag.java b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/PutAttributeTag.java index c4fa7c91c..3636d22cb 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/PutAttributeTag.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/PutAttributeTag.java @@ -23,8 +23,8 @@ package org.apache.tiles.web.jsp.taglib; import java.io.IOException; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import org.apache.tiles.autotag.core.runtime.ModelBody; import org.apache.tiles.autotag.core.runtime.AutotagRuntime; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/PutListAttributeTag.java b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/PutListAttributeTag.java index 1e96972c7..017786af0 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/PutListAttributeTag.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/PutListAttributeTag.java @@ -23,8 +23,8 @@ package org.apache.tiles.web.jsp.taglib; import java.io.IOException; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import org.apache.tiles.autotag.core.runtime.ModelBody; import org.apache.tiles.autotag.core.runtime.AutotagRuntime; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/SetCurrentContainerTag.java b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/SetCurrentContainerTag.java index 370f3b418..6639823ba 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/SetCurrentContainerTag.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/SetCurrentContainerTag.java @@ -23,8 +23,8 @@ package org.apache.tiles.web.jsp.taglib; import java.io.IOException; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import org.apache.tiles.autotag.core.runtime.AutotagRuntime; diff --git a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/UseAttributeTag.java b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/UseAttributeTag.java index e2740e56c..096011654 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/UseAttributeTag.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/UseAttributeTag.java @@ -23,11 +23,11 @@ import org.apache.tiles.request.Request; import org.apache.tiles.request.jsp.autotag.JspAutotagRuntime; import org.apache.tiles.template.ImportAttributeModel; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import javax.servlet.jsp.tagext.TagData; -import javax.servlet.jsp.tagext.TagExtraInfo; -import javax.servlet.jsp.tagext.VariableInfo; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.tagext.TagData; +import jakarta.servlet.jsp.tagext.TagExtraInfo; +import jakarta.servlet.jsp.tagext.VariableInfo; import java.io.IOException; /** diff --git a/plugins/tiles/src/main/java/org/apache/tiles/web/startup/AbstractTilesListener.java b/plugins/tiles/src/main/java/org/apache/tiles/web/startup/AbstractTilesListener.java index 465431b06..336c37f23 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/web/startup/AbstractTilesListener.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/web/startup/AbstractTilesListener.java @@ -21,9 +21,9 @@ package org.apache.tiles.web.startup; import org.apache.tiles.core.startup.TilesInitializer; import org.apache.tiles.request.servlet.ServletApplicationContext; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; /** * Listener for the initialization of the Tiles container. diff --git a/plugins/tiles/src/main/java/org/apache/tiles/web/util/AttributeContextMutator.java b/plugins/tiles/src/main/java/org/apache/tiles/web/util/AttributeContextMutator.java index aa99ca099..02ff11f63 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/web/util/AttributeContextMutator.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/web/util/AttributeContextMutator.java @@ -20,7 +20,7 @@ package org.apache.tiles.web.util; import org.apache.tiles.api.AttributeContext; -import javax.servlet.ServletRequest; +import jakarta.servlet.ServletRequest; /** * It represents an object able to manipulate a AttributeContext. diff --git a/plugins/tiles/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java b/plugins/tiles/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java index d456848c8..dd7a91fdb 100644 --- a/plugins/tiles/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java +++ b/plugins/tiles/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java @@ -28,10 +28,10 @@ import org.apache.tiles.request.Request; import org.apache.tiles.request.reflect.ClassUtil; import org.apache.tiles.request.servlet.ServletRequest; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Tiles dispatching servlet. Used to invoke diff --git a/plugins/tiles/src/main/resources/org/apache/tiles/autotag/jsp/bodyTag.vm b/plugins/tiles/src/main/resources/org/apache/tiles/autotag/jsp/bodyTag.vm index e48be526c..c36a07cf7 100644 --- a/plugins/tiles/src/main/resources/org/apache/tiles/autotag/jsp/bodyTag.vm +++ b/plugins/tiles/src/main/resources/org/apache/tiles/autotag/jsp/bodyTag.vm @@ -23,8 +23,8 @@ package ${packageName}; import java.io.IOException; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; #if(${clazz.hasBody()}) import org.apache.tiles.autotag.core.runtime.ModelBody; diff --git a/plugins/tiles/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java b/plugins/tiles/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java index 8c1c794ba..24243ae68 100644 --- a/plugins/tiles/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java +++ b/plugins/tiles/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java @@ -26,13 +26,13 @@ import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.Request; import org.easymock.EasyMock; -import javax.el.ArrayELResolver; -import javax.el.BeanELResolver; -import javax.el.CompositeELResolver; -import javax.el.ELResolver; -import javax.el.ListELResolver; -import javax.el.MapELResolver; -import javax.el.ResourceBundleELResolver; +import jakarta.el.ArrayELResolver; +import jakarta.el.BeanELResolver; +import jakarta.el.CompositeELResolver; +import jakarta.el.ELResolver; +import jakarta.el.ListELResolver; +import jakarta.el.MapELResolver; +import jakarta.el.ResourceBundleELResolver; import java.util.Arrays; import java.util.HashMap; import java.util.Map; diff --git a/plugins/tiles/src/test/java/org/apache/tiles/el/ELContextImplTest.java b/plugins/tiles/src/test/java/org/apache/tiles/el/ELContextImplTest.java index b9a835318..6e70095cf 100644 --- a/plugins/tiles/src/test/java/org/apache/tiles/el/ELContextImplTest.java +++ b/plugins/tiles/src/test/java/org/apache/tiles/el/ELContextImplTest.java @@ -21,10 +21,10 @@ package org.apache.tiles.el; import org.junit.Before; import org.junit.Test; -import javax.el.ELResolver; -import javax.el.FunctionMapper; -import javax.el.ValueExpression; -import javax.el.VariableMapper; +import jakarta.el.ELResolver; +import jakarta.el.FunctionMapper; +import jakarta.el.ValueExpression; +import jakarta.el.VariableMapper; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.replay; diff --git a/plugins/tiles/src/test/java/org/apache/tiles/el/JspExpressionFactoryFactoryTest.java b/plugins/tiles/src/test/java/org/apache/tiles/el/JspExpressionFactoryFactoryTest.java index b7092e530..095241316 100644 --- a/plugins/tiles/src/test/java/org/apache/tiles/el/JspExpressionFactoryFactoryTest.java +++ b/plugins/tiles/src/test/java/org/apache/tiles/el/JspExpressionFactoryFactoryTest.java @@ -21,10 +21,10 @@ package org.apache.tiles.el; import org.apache.tiles.request.ApplicationContext; import org.junit.Test; -import javax.el.ExpressionFactory; -import javax.servlet.ServletContext; -import javax.servlet.jsp.JspApplicationContext; -import javax.servlet.jsp.JspFactory; +import jakarta.el.ExpressionFactory; +import jakarta.servlet.ServletContext; +import jakarta.servlet.jsp.JspApplicationContext; +import jakarta.servlet.jsp.JspFactory; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; diff --git a/plugins/tiles/src/test/java/org/apache/tiles/el/ScopeELResolverTest.java b/plugins/tiles/src/test/java/org/apache/tiles/el/ScopeELResolverTest.java index bdd8d799e..601f454c1 100644 --- a/plugins/tiles/src/test/java/org/apache/tiles/el/ScopeELResolverTest.java +++ b/plugins/tiles/src/test/java/org/apache/tiles/el/ScopeELResolverTest.java @@ -23,7 +23,7 @@ import org.apache.tiles.request.Request; import org.junit.Before; import org.junit.Test; -import javax.el.ELContext; +import jakarta.el.ELContext; import java.beans.FeatureDescriptor; import java.util.Arrays; import java.util.HashMap; diff --git a/plugins/tiles/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java b/plugins/tiles/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java index 5a1214ec2..519e3ac6a 100644 --- a/plugins/tiles/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java +++ b/plugins/tiles/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java @@ -23,7 +23,7 @@ import org.apache.tiles.request.Request; import org.junit.Before; import org.junit.Test; -import javax.el.ELContext; +import jakarta.el.ELContext; import java.beans.FeatureDescriptor; import java.util.ArrayList; import java.util.Arrays; diff --git a/plugins/tiles/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java b/plugins/tiles/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java index c3685aaf9..82b075a7d 100644 --- a/plugins/tiles/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java +++ b/plugins/tiles/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java @@ -24,8 +24,8 @@ import org.apache.tiles.request.reflect.ClassUtil; import org.junit.Before; import org.junit.Test; -import javax.el.ELContext; -import javax.el.ELResolver; +import jakarta.el.ELContext; +import jakarta.el.ELResolver; import java.beans.FeatureDescriptor; import java.beans.PropertyDescriptor; import java.util.Iterator; diff --git a/plugins/tiles/src/test/java/org/apache/tiles/web/jsp/taglib/UseAttributeTagTest.java b/plugins/tiles/src/test/java/org/apache/tiles/web/jsp/taglib/UseAttributeTagTest.java index 48486746f..b796418f1 100644 --- a/plugins/tiles/src/test/java/org/apache/tiles/web/jsp/taglib/UseAttributeTagTest.java +++ b/plugins/tiles/src/test/java/org/apache/tiles/web/jsp/taglib/UseAttributeTagTest.java @@ -29,14 +29,14 @@ import static org.junit.Assert.assertTrue; import java.io.IOException; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.JspFragment; -import javax.servlet.jsp.tagext.JspTag; -import javax.servlet.jsp.tagext.TagData; -import javax.servlet.jsp.tagext.VariableInfo; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.tagext.JspFragment; +import jakarta.servlet.jsp.tagext.JspTag; +import jakarta.servlet.jsp.tagext.TagData; +import jakarta.servlet.jsp.tagext.VariableInfo; import org.apache.tiles.api.Attribute; import org.apache.tiles.api.AttributeContext; diff --git a/plugins/tiles/src/test/java/org/apache/tiles/web/startup/AbstractTilesListenerTest.java b/plugins/tiles/src/test/java/org/apache/tiles/web/startup/AbstractTilesListenerTest.java index dbf6f3ec2..85ff29b4a 100644 --- a/plugins/tiles/src/test/java/org/apache/tiles/web/startup/AbstractTilesListenerTest.java +++ b/plugins/tiles/src/test/java/org/apache/tiles/web/startup/AbstractTilesListenerTest.java @@ -22,8 +22,8 @@ import org.apache.tiles.core.startup.TilesInitializer; import org.apache.tiles.request.servlet.ServletApplicationContext; import org.junit.Test; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.createMockBuilder; diff --git a/plugins/tiles/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffNoBodyTag.java b/plugins/tiles/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffNoBodyTag.java index 85433d581..9697c7c0d 100644 --- a/plugins/tiles/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffNoBodyTag.java +++ b/plugins/tiles/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffNoBodyTag.java @@ -23,8 +23,8 @@ package org.apache.tiles.autotag.jsp.test; import java.io.IOException; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import org.apache.tiles.autotag.core.runtime.AutotagRuntime; diff --git a/plugins/tiles/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffTag.java b/plugins/tiles/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffTag.java index 6ad8b1e6f..fa86b1139 100644 --- a/plugins/tiles/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffTag.java +++ b/plugins/tiles/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffTag.java @@ -23,8 +23,8 @@ package org.apache.tiles.autotag.jsp.test; import java.io.IOException; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.SimpleTagSupport; import org.apache.tiles.autotag.core.runtime.ModelBody; import org.apache.tiles.autotag.core.runtime.AutotagRuntime; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java index 2b9e00191..deed524cd 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java @@ -38,9 +38,9 @@ import org.apache.velocity.tools.ToolContext; import org.apache.velocity.tools.ToolManager; import org.apache.velocity.tools.ToolboxFactory; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityStrutsUtil.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityStrutsUtil.java index 9ecc598d8..da10609de 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityStrutsUtil.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityStrutsUtil.java @@ -26,8 +26,8 @@ import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.exception.ResourceNotFoundException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.CharArrayWriter; import java.io.IOException; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java index e955b32aa..e05fbe450 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java @@ -23,8 +23,8 @@ import java.io.Writer; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.ServletActionContext; import org.apache.struts2.components.Component; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java index 17c4785da..0c64517d3 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.ActionComponent; import org.apache.struts2.components.Component; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java index dfba7bd23..ada5f481b 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.ActionError; import org.apache.struts2.components.Component; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java index 39434eb65..c0a364587 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.ActionMessage; import org.apache.struts2.components.Component; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java index 410b3f886..8e9ad18d5 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Anchor; import org.apache.struts2.components.Component; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java index 650edaed8..021aa4135 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Bean; import org.apache.struts2.components.Component; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java index 6b25b81f6..9b7bb0ca1 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Checkbox; import org.apache.struts2.components.Component; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java index 81bd5befe..9c1dcd7d4 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.CheckboxList; import org.apache.struts2.components.Component; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java index 077ef2ba0..8d557f0ed 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.ComboBox; import org.apache.struts2.components.Component; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java index f4eadc771..eed116240 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.GenericUIBean; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java index f827f677f..aa61d56be 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Date; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java index 2aa532dc0..47bec6875 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.DoubleSelect; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java index 4a462e8f4..cb310b1b7 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.FieldError; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java index d2377228e..173809961 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.File; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java index d77e142bc..25afa9473 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Form; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java index b5002843f..44fc3df26 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Head; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java index c8bd63668..fbe941b1c 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Hidden; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java index 705b640f0..54f7a49bc 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.I18n; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java index b58a9a2d1..54756d2ab 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Include; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/InputTransferSelectDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/InputTransferSelectDirective.java index d0f19f6f6..8e4433d3d 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/InputTransferSelectDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/InputTransferSelectDirective.java @@ -22,8 +22,8 @@ import org.apache.struts2.components.Component; import org.apache.struts2.components.InputTransferSelect; import com.opensymphony.xwork2.util.ValueStack; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @see org.apache.struts2.components.InputTransferSelect diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java index 0cb28f103..c24d43be2 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Label; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java index 9206cb4f3..00c5c8885 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.OptGroup; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java index 9d02caff7..a6689b232 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.OptionTransferSelect; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java index 03b196a23..c80805afa 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Param; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java index 756f169bf..3ffff8dba 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Password; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java index ac8997b80..90bc39781 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Property; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java index cc76dc3ee..a5a79c395 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Push; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java index 08edfd79d..f5b8def84 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Radio; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java index 193c011da..1371a0804 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Reset; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java index 0e2bd44bb..7f5efde0c 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Select; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java index c3115e923..cbf9f8354 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Set; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java index 19d59d1e1..6b8e8a986 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Submit; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java index 86c9f0b84..a533f14b2 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.TextArea; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java index 1956f5d09..de8126ced 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Text; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java index 76a5d0e72..1fd115fc4 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.TextField; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java index 5173d63ef..ce112b5b3 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.Token; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java index 7a435b6ae..c43707d76 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.URL; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java index 4a4da682c..77466c89c 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.views.velocity.components; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Component; import org.apache.struts2.components.UpDownSelect; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/result/VelocityResult.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/result/VelocityResult.java index 68b56451b..1af1ef739 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/result/VelocityResult.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/result/VelocityResult.java @@ -33,12 +33,12 @@ import org.apache.velocity.Template; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.context.Context; -import javax.servlet.Servlet; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.JspFactory; -import javax.servlet.jsp.PageContext; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.JspFactory; +import jakarta.servlet.jsp.PageContext; import java.io.OutputStreamWriter; import java.io.Writer; diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/template/VelocityTemplateEngine.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/template/VelocityTemplateEngine.java index 423029e32..6788e0217 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/template/VelocityTemplateEngine.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/template/VelocityTemplateEngine.java @@ -29,9 +29,9 @@ import org.apache.struts2.views.velocity.VelocityManager; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.context.Context; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.Writer; import java.util.List; import java.util.Map; diff --git a/plugins/velocity/src/test/java/org/apache/struts2/views/velocity/VelocityManagerTest.java b/plugins/velocity/src/test/java/org/apache/struts2/views/velocity/VelocityManagerTest.java index 4ff6079b4..b95fc8d8a 100644 --- a/plugins/velocity/src/test/java/org/apache/struts2/views/velocity/VelocityManagerTest.java +++ b/plugins/velocity/src/test/java/org/apache/struts2/views/velocity/VelocityManagerTest.java @@ -28,8 +28,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Properties; import static org.apache.struts2.views.velocity.VelocityManager.KEY_VELOCITY_STRUTS_CONTEXT; diff --git a/plugins/xslt/src/main/java/org/apache/struts2/result/xslt/ServletURIResolver.java b/plugins/xslt/src/main/java/org/apache/struts2/result/xslt/ServletURIResolver.java index 8521b334d..c2aff8d56 100644 --- a/plugins/xslt/src/main/java/org/apache/struts2/result/xslt/ServletURIResolver.java +++ b/plugins/xslt/src/main/java/org/apache/struts2/result/xslt/ServletURIResolver.java @@ -21,7 +21,7 @@ package org.apache.struts2.result.xslt; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import javax.xml.transform.Source; import javax.xml.transform.TransformerException; import javax.xml.transform.URIResolver; diff --git a/plugins/xslt/src/main/java/org/apache/struts2/result/xslt/XSLTResult.java b/plugins/xslt/src/main/java/org/apache/struts2/result/xslt/XSLTResult.java index 36efe1851..3670fb929 100644 --- a/plugins/xslt/src/main/java/org/apache/struts2/result/xslt/XSLTResult.java +++ b/plugins/xslt/src/main/java/org/apache/struts2/result/xslt/XSLTResult.java @@ -29,7 +29,7 @@ import org.apache.logging.log4j.Logger; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import javax.xml.XMLConstants; import javax.xml.transform.ErrorListener; import javax.xml.transform.OutputKeys; diff --git a/pom.xml b/pom.xml index 5325817e0..d9c988827 100644 --- a/pom.xml +++ b/pom.xml @@ -114,11 +114,11 @@ 2.20.0 3.3.4 2.0.9 - 5.3.27 + 6.0.13 3.0.8 1.0.7 3.0.0-M7 - 6.2.4.Final + 8.0.1.Final 2.3.32 @@ -792,16 +792,16 @@ - javax.servlet - javax.servlet-api - 3.1.0 + jakarta.servlet + jakarta.servlet-api + 6.0.0 provided - org.glassfish - javax.el - 3.0.1-b12 + org.glassfish + jakarta.el + 5.0.0-M1 @@ -812,30 +812,30 @@ - javax.servlet - jstl - 1.2 + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + 3.0.0 test org.apache.tomcat tomcat-jasper - 8.5.53 + 11.0.0-M13 provided org.apache.tomcat tomcat-api - 8.5.53 + 11.0.0-M13 provided - javax.servlet.jsp - jsp-api - 2.1 + jakarta.servlet.jsp + jakarta.servlet.jsp-api + 3.1.0 provided @@ -849,7 +849,7 @@ org.apache.tomcat tomcat-juli - 8.5.53 + 11.0.0-M13 @@ -1080,9 +1080,9 @@ 1.2.1 - javax.persistence - persistence-api - 1.0.2 + jakarta.persistence + jakarta.persistence-api + 3.1.0 @@ -1127,9 +1127,9 @@ - javax.enterprise - cdi-api - 1.2 + jakarta.enterprise + jakarta.enterprise.cdi-api + 4.0.0