File javax2jakarta.patch of Package struts

Index: struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/Constants.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-chain/src/java/org/apache/struts/chain/Constants.java
+++ struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/Constants.java
@@ -144,7 +144,7 @@ public final class Constants {
      * processing during a RequestDispatcher.include() call.</p>
      */
     public static final String INCLUDE_PATH_INFO =
-        "javax.servlet.include.path_info";
+        "jakarta.servlet.include.path_info";
 
 
     /**
@@ -152,7 +152,7 @@ public final class Constants {
      * processing during a RequestDispatcher.include() call.</p>
      */
     public static final String INCLUDE_SERVLET_PATH =
-        "javax.servlet.include.servlet_path";
+        "jakarta.servlet.include.servlet_path";
 
 
 }
Index: struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/legacy/CatalogConfiguratorPlugIn.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-chain/src/java/org/apache/struts/chain/legacy/CatalogConfiguratorPlugIn.java
+++ struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/legacy/CatalogConfiguratorPlugIn.java
@@ -19,7 +19,7 @@ package org.apache.struts.chain.legacy;
 
 import java.net.URL;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import org.apache.struts.action.ActionServlet;
 import org.apache.struts.action.PlugIn;
Index: struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/legacy/ChainAction.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-chain/src/java/org/apache/struts/chain/legacy/ChainAction.java
+++ struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/legacy/ChainAction.java
@@ -16,8 +16,8 @@
 
 package org.apache.struts.chain.legacy;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.commons.chain.Catalog;
 import org.apache.commons.chain.CatalogFactory;
Index: struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/legacy/ComposableRequestProcessor.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-chain/src/java/org/apache/struts/chain/legacy/ComposableRequestProcessor.java
+++ struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/legacy/ComposableRequestProcessor.java
@@ -18,9 +18,9 @@ package org.apache.struts.chain.legacy;
 
 
 import java.io.IOException;
-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.commons.chain.Catalog;
 import org.apache.commons.chain.CatalogFactory;
 import org.apache.commons.chain.Command;
Index: struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/legacy/DispatchAction.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-chain/src/java/org/apache/struts/chain/legacy/DispatchAction.java
+++ struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/legacy/DispatchAction.java
@@ -16,8 +16,8 @@
 
 package org.apache.struts.chain.legacy;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.commons.chain.Catalog;
 import org.apache.commons.chain.CatalogFactory;
Index: struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/AuthorizeAction.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/AuthorizeAction.java
+++ struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/AuthorizeAction.java
@@ -17,7 +17,7 @@
 package org.apache.struts.chain.servlet;
 
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.chain.Context;
 import org.apache.commons.chain.web.servlet.ServletWebContext;
 import org.apache.struts.chain.AbstractAuthorizeAction;
Index: struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/ExceptionHandler.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/ExceptionHandler.java
+++ struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/ExceptionHandler.java
@@ -17,8 +17,8 @@
 package org.apache.struts.chain.servlet;
 
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.chain.Context;
 import org.apache.commons.chain.web.servlet.ServletWebContext;
 import org.apache.commons.logging.Log;
Index: struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/PerformForward.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/PerformForward.java
+++ struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/PerformForward.java
@@ -17,8 +17,8 @@
 package org.apache.struts.chain.servlet;
 
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.chain.Context;
 import org.apache.commons.chain.web.servlet.ServletWebContext;
 import org.apache.struts.chain.AbstractPerformForward;
Index: struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/PerformInclude.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/PerformInclude.java
+++ struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/PerformInclude.java
@@ -17,8 +17,8 @@
 package org.apache.struts.chain.servlet;
 
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.chain.Context;
 import org.apache.commons.chain.web.servlet.ServletWebContext;
 import org.apache.struts.chain.AbstractPerformInclude;
Index: struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/RequestNoCache.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/RequestNoCache.java
+++ struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/RequestNoCache.java
@@ -17,7 +17,7 @@
 package org.apache.struts.chain.servlet;
 
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.chain.Context;
 import org.apache.commons.chain.web.servlet.ServletWebContext;
 import org.apache.struts.chain.AbstractRequestNoCache;
Index: struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/SelectAction.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/SelectAction.java
+++ struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/SelectAction.java
@@ -17,7 +17,7 @@
 package org.apache.struts.chain.servlet;
 
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.chain.Context;
 import org.apache.commons.chain.web.servlet.ServletWebContext;
 import org.apache.struts.chain.AbstractSelectAction;
Index: struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/SelectLocale.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/SelectLocale.java
+++ struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/SelectLocale.java
@@ -18,7 +18,7 @@ package org.apache.struts.chain.servlet;
 
 
 import java.util.Locale;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 import org.apache.commons.chain.Context;
 import org.apache.commons.chain.web.servlet.ServletWebContext;
 import org.apache.struts.Globals;
Index: struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/SelectModule.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/SelectModule.java
+++ struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/SelectModule.java
@@ -17,7 +17,7 @@
 package org.apache.struts.chain.servlet;
 
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.chain.Context;
 import org.apache.commons.chain.web.servlet.ServletWebContext;
 import org.apache.struts.Globals;
Index: struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/SetContentType.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/SetContentType.java
+++ struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/SetContentType.java
@@ -17,7 +17,7 @@
 package org.apache.struts.chain.servlet;
 
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.chain.Context;
 import org.apache.commons.chain.web.servlet.ServletWebContext;
 import org.apache.struts.chain.AbstractSetContentType;
Index: struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/TilesPreProcessor.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/TilesPreProcessor.java
+++ struts-1.2.9-src/contrib/struts-chain/src/java/org/apache/struts/chain/servlet/TilesPreProcessor.java
@@ -21,10 +21,10 @@ package org.apache.struts.chain.servlet;
 
 import java.io.IOException;
 
-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.commons.chain.Command;
 import org.apache.commons.chain.Context;
Index: struts-1.2.9-src/contrib/struts-el/doc/proposals/workflow.xml
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/doc/proposals/workflow.xml
+++ struts-1.2.9-src/contrib/struts-el/doc/proposals/workflow.xml
@@ -293,7 +293,7 @@
   <em>Scopes</em> in which beans can be stashed, with pluggable
   implementations for integration into different working environments.
   None of the APIs in the workflow engine itself will have any reference
-  to the web layer (i.e. no imports of <code>javax.servlet.*</code>).</p>
+  to the web layer (i.e. no imports of <code>jakarta.servlet.*</code>).</p>
 
     <blockquote><em>
     <p>Suitable object factory and pluggability APIs will be included
Index: struts-1.2.9-src/contrib/struts-el/project.xml
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/project.xml
+++ struts-1.2.9-src/contrib/struts-el/project.xml
@@ -37,7 +37,7 @@ for evaluating attribute values.
   <dependencies>
 
     <dependency>
-      <groupId>javax.servlet</groupId>
+      <groupId>jakarta.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.3</version>
       <properties>
@@ -50,7 +50,7 @@ for evaluating attribute values.
       <version>1.0.6</version>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
+      <groupId>jakarta.servlet</groupId>
       <artifactId>jstl</artifactId>
       <version>1.0.6</version>
       <url>http://jakarta.apache.org/taglibs/doc/standard-1.0-doc/intro.html</url>
Index: struts-1.2.9-src/contrib/struts-el/src/exercise-taglib/org/apache/struts/webapp/exercise/DynaSetAction.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/exercise-taglib/org/apache/struts/webapp/exercise/DynaSetAction.java
+++ struts-1.2.9-src/contrib/struts-el/src/exercise-taglib/org/apache/struts/webapp/exercise/DynaSetAction.java
@@ -18,8 +18,8 @@
 
 package org.apache.struts.webapp.exercise;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
Index: struts-1.2.9-src/contrib/struts-el/src/exercise-taglib/org/apache/struts/webapp/exercise/HtmlSettersAction.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/exercise-taglib/org/apache/struts/webapp/exercise/HtmlSettersAction.java
+++ struts-1.2.9-src/contrib/struts-el/src/exercise-taglib/org/apache/struts/webapp/exercise/HtmlSettersAction.java
@@ -20,8 +20,8 @@
 package org.apache.struts.webapp.exercise;
 
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
Index: struts-1.2.9-src/contrib/struts-el/src/exercise-taglib/org/apache/struts/webapp/exercise/TestBean.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/exercise-taglib/org/apache/struts/webapp/exercise/TestBean.java
+++ struts-1.2.9-src/contrib/struts-el/src/exercise-taglib/org/apache/struts/webapp/exercise/TestBean.java
@@ -22,7 +22,7 @@ package org.apache.struts.webapp.exercis
 
 import java.util.Collection;
 import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.util.LabelValueBean;
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELIncludeTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELIncludeTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELIncludeTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.bean;
 
 import org.apache.struts.taglib.bean.IncludeTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELMessageTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELMessageTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELMessageTag.java
@@ -18,7 +18,7 @@
 
 package org.apache.strutsel.taglib.bean;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.bean.MessageTag;
 import org.apache.strutsel.taglib.utils.EvalHelper;
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELPageTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELPageTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELPageTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.bean;
 
 import org.apache.struts.taglib.bean.PageTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELResourceTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELResourceTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELResourceTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.bean;
 
 import org.apache.struts.taglib.bean.ResourceTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELSizeTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELSizeTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELSizeTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.bean;
 
 import org.apache.struts.taglib.bean.SizeTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELStrutsTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELStrutsTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/bean/ELStrutsTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.bean;
 
 import org.apache.struts.taglib.bean.StrutsTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELBaseTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELBaseTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELBaseTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.BaseTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELButtonTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELButtonTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELButtonTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.ButtonTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELCancelTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELCancelTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELCancelTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.CancelTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELCheckboxTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELCheckboxTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELCheckboxTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.CheckboxTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELErrorsTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELErrorsTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELErrorsTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.ErrorsTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFileTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFileTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFileTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.FileTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFormTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFormTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFormTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.FormTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFrameTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFrameTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFrameTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.FrameTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELHiddenTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELHiddenTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELHiddenTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.HiddenTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELHtmlTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELHtmlTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELHtmlTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.HtmlTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELImageTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELImageTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELImageTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.ImageTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELImgTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELImgTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELImgTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.ImgTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELJavascriptValidatorTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELJavascriptValidatorTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELJavascriptValidatorTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.JavascriptValidatorTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELLinkTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELLinkTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELLinkTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.LinkTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELMessagesTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELMessagesTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELMessagesTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.MessagesTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELMultiboxTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELMultiboxTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELMultiboxTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.MultiboxTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELOptionTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELOptionTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELOptionTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.OptionTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELOptionsCollectionTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELOptionsCollectionTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELOptionsCollectionTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.OptionsCollectionTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELOptionsTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELOptionsTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELOptionsTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.OptionsTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELPasswordTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELPasswordTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELPasswordTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.PasswordTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELRadioTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELRadioTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELRadioTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.RadioTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELResetTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELResetTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELResetTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.ResetTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELRewriteTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELRewriteTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELRewriteTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.RewriteTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELSelectTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELSelectTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELSelectTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.SelectTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELSubmitTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELSubmitTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELSubmitTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.SubmitTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELTextTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELTextTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELTextTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.TextTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELTextareaTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELTextareaTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELTextareaTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.html;
 
 import org.apache.struts.taglib.html.TextareaTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELForwardTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELForwardTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELForwardTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.logic;
 
 import org.apache.struts.taglib.logic.ForwardTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELIterateTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELIterateTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELIterateTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.logic;
 
 import org.apache.struts.taglib.logic.IterateTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELMatchSupport.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELMatchSupport.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELMatchSupport.java
@@ -19,8 +19,8 @@
 package org.apache.strutsel.taglib.logic;
 
 import org.apache.struts.util.MessageResources;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
 import org.apache.struts.taglib.TagUtils;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELMatchTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELMatchTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELMatchTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.logic;
 
 import org.apache.struts.taglib.logic.MatchTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELMessagesNotPresentTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELMessagesNotPresentTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELMessagesNotPresentTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.logic;
 
 import org.apache.struts.taglib.logic.MessagesNotPresentTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELMessagesPresentTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELMessagesPresentTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELMessagesPresentTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.logic;
 
 import org.apache.struts.taglib.logic.MessagesPresentTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELNotMatchTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELNotMatchTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELNotMatchTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.logic;
 
 import org.apache.struts.taglib.logic.NotMatchTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELNotPresentTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELNotPresentTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELNotPresentTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.logic;
 
 import org.apache.struts.taglib.logic.NotPresentTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELPresentTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELPresentTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELPresentTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.logic;
 
 import org.apache.struts.taglib.logic.PresentTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELRedirectTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELRedirectTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/logic/ELRedirectTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.logic;
 
 import org.apache.struts.taglib.logic.RedirectTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELAddTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELAddTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELAddTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.tiles;
 
 import org.apache.struts.taglib.tiles.AddTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELDefinitionTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELDefinitionTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELDefinitionTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.tiles;
 
 import org.apache.struts.taglib.tiles.DefinitionTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELGetAttributeTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELGetAttributeTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELGetAttributeTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.tiles;
 
 import org.apache.struts.taglib.tiles.GetAttributeTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELGetTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELGetTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELGetTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.tiles;
 
 import org.apache.struts.taglib.tiles.GetTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELImportAttributeTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELImportAttributeTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELImportAttributeTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.tiles;
 
 import org.apache.struts.taglib.tiles.ImportAttributeTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELInitDefinitionsTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELInitDefinitionsTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELInitDefinitionsTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.tiles;
 
 import org.apache.struts.taglib.tiles.InitDefinitionsTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELInsertTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELInsertTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELInsertTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.tiles;
 
 import org.apache.struts.taglib.tiles.InsertTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELPutListTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELPutListTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELPutListTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.tiles;
 
 import org.apache.struts.taglib.tiles.PutListTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELPutTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELPutTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELPutTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.tiles;
 
 import org.apache.struts.taglib.tiles.PutTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELUseAttributeTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELUseAttributeTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/tiles/ELUseAttributeTag.java
@@ -19,7 +19,7 @@
 package org.apache.strutsel.taglib.tiles;
 
 import org.apache.struts.taglib.tiles.UseAttributeTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.strutsel.taglib.utils.EvalHelper;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/utils/EvalHelper.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/share/org/apache/strutsel/taglib/utils/EvalHelper.java
+++ struts-1.2.9-src/contrib/struts-el/src/share/org/apache/strutsel/taglib/utils/EvalHelper.java
@@ -18,9 +18,9 @@
 
 package org.apache.strutsel.taglib.utils;
 
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.Tag;
 import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
 
 /**
Index: struts-1.2.9-src/contrib/struts-el/src/test/org/apache/strutsel/taglib/bean/TestELSizeTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/test/org/apache/strutsel/taglib/bean/TestELSizeTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/test/org/apache/strutsel/taglib/bean/TestELSizeTag.java
@@ -20,8 +20,8 @@ package org.apache.strutsel.taglib.bean;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import javax.servlet.ServletException;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.cactus.JspTestCase;
 import org.apache.strutsel.taglib.utils.TestFormBean;
 
Index: struts-1.2.9-src/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELBaseTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELBaseTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELBaseTag.java
@@ -20,10 +20,10 @@ package org.apache.strutsel.taglib.html;
 
 import java.util.HashMap;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELButtonTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELButtonTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELButtonTag.java
@@ -20,9 +20,9 @@ package org.apache.strutsel.taglib.html;
 
 import java.util.HashMap;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELCancelTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELCancelTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELCancelTag.java
@@ -20,9 +20,9 @@ package org.apache.strutsel.taglib.html;
 
 import java.util.HashMap;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELCheckboxTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELCheckboxTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELCheckboxTag.java
@@ -20,9 +20,9 @@ package org.apache.strutsel.taglib.html;
 
 import java.util.HashMap;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELFileTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELFileTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELFileTag.java
@@ -20,9 +20,9 @@ package org.apache.strutsel.taglib.html;
 
 import java.util.HashMap;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELFrameTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELFrameTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELFrameTag.java
@@ -18,9 +18,9 @@
 
 package org.apache.strutsel.taglib.html;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.apache.strutsel.taglib.utils.JspTagTestCase;
Index: struts-1.2.9-src/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELHiddenTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELHiddenTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELHiddenTag.java
@@ -19,8 +19,8 @@
 package org.apache.strutsel.taglib.html;
 
 import java.util.HashMap;
-import javax.servlet.ServletException;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.jsp.JspException;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.apache.struts.util.LabelValueBean;
Index: struts-1.2.9-src/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELHtmlTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELHtmlTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELHtmlTag.java
@@ -19,8 +19,8 @@
 package org.apache.strutsel.taglib.html;
 
 import java.util.HashMap;
-import javax.servlet.ServletException;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.jsp.JspException;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.apache.strutsel.taglib.utils.DOMHelper;
Index: struts-1.2.9-src/contrib/struts-el/src/test/org/apache/strutsel/taglib/logic/TestELMatchTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/test/org/apache/strutsel/taglib/logic/TestELMatchTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/test/org/apache/strutsel/taglib/logic/TestELMatchTag.java
@@ -18,9 +18,9 @@
 
 package org.apache.strutsel.taglib.logic;
 
-import javax.servlet.ServletException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.Tag;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/contrib/struts-el/src/test/org/apache/strutsel/taglib/logic/TestELNotMatchTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-el/src/test/org/apache/strutsel/taglib/logic/TestELNotMatchTag.java
+++ struts-1.2.9-src/contrib/struts-el/src/test/org/apache/strutsel/taglib/logic/TestELNotMatchTag.java
@@ -18,9 +18,9 @@
 
 package org.apache.strutsel.taglib.logic;
 
-import javax.servlet.ServletException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.Tag;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/application/ActionListenerImpl.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/application/ActionListenerImpl.java
+++ struts-1.2.9-src/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/application/ActionListenerImpl.java
@@ -24,9 +24,9 @@ import javax.faces.context.FacesContext;
 import javax.faces.event.AbortProcessingException;
 import javax.faces.event.ActionEvent;
 import javax.faces.event.ActionListener;
-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.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts.Globals;
Index: struts-1.2.9-src/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java
+++ struts-1.2.9-src/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java
@@ -27,9 +27,9 @@ import javax.faces.context.FacesContextF
 import javax.faces.event.ActionEvent;
 import javax.faces.lifecycle.Lifecycle;
 import javax.faces.lifecycle.LifecycleFactory;
-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.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts.Globals;
Index: struts-1.2.9-src/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java
+++ struts-1.2.9-src/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java
@@ -27,9 +27,9 @@ import javax.faces.context.FacesContextF
 import javax.faces.event.ActionEvent;
 import javax.faces.lifecycle.Lifecycle;
 import javax.faces.lifecycle.LifecycleFactory;
-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.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts.Globals;
Index: struts-1.2.9-src/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/component/FormComponent.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/component/FormComponent.java
+++ struts-1.2.9-src/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/component/FormComponent.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import javax.faces.component.UIForm;
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 import org.apache.commons.beanutils.DynaBean;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/renderer/BaseRenderer.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/renderer/BaseRenderer.java
+++ struts-1.2.9-src/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/renderer/BaseRenderer.java
@@ -24,7 +24,7 @@ import javax.faces.FacesException;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.commons.beanutils.MethodUtils;
 import org.apache.commons.logging.Log;
Index: struts-1.2.9-src/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/renderer/FormRenderer.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/renderer/FormRenderer.java
+++ struts-1.2.9-src/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/renderer/FormRenderer.java
@@ -24,7 +24,7 @@ import javax.faces.component.NamingConta
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/renderer/HtmlRenderer.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/renderer/HtmlRenderer.java
+++ struts-1.2.9-src/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/renderer/HtmlRenderer.java
@@ -22,7 +22,7 @@ import java.util.Locale;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts.Globals;
Index: struts-1.2.9-src/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/taglib/HtmlTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/taglib/HtmlTag.java
+++ struts-1.2.9-src/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/taglib/HtmlTag.java
@@ -18,8 +18,8 @@ package org.apache.struts.faces.taglib;
 
 
 import javax.faces.component.UIComponent;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
 import org.apache.struts.Globals;
 
 
Index: struts-1.2.9-src/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/taglib/JavascriptValidatorTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/taglib/JavascriptValidatorTag.java
+++ struts-1.2.9-src/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/taglib/JavascriptValidatorTag.java
@@ -28,11 +28,11 @@ import java.util.Map;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.webapp.UIComponentTag;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-import javax.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.tagext.Tag;
 
 import org.apache.commons.validator.Field;
 import org.apache.commons.validator.Form;
@@ -505,7 +505,7 @@ public class JavascriptValidatorTag exte
             throw new JspException(e.getMessage());
         }
 
-        return (EVAL_BODY_TAG);
+        return (EVAL_BODY_BUFFERED);
 
     }
 
Index: struts-1.2.9-src/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/taglib/LoadMessagesTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/taglib/LoadMessagesTag.java
+++ struts-1.2.9-src/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/taglib/LoadMessagesTag.java
@@ -21,8 +21,8 @@ import java.util.Locale;
 
 import javax.faces.context.FacesContext;
 
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.TagSupport;
 
 import org.apache.struts.Globals;
 import org.apache.struts.faces.util.MessagesMap;
Index: struts-1.2.9-src/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/util/HttpServletRequestWrapper.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/util/HttpServletRequestWrapper.java
+++ struts-1.2.9-src/contrib/struts-faces/core-library/src/java/org/apache/struts/faces/util/HttpServletRequestWrapper.java
@@ -23,11 +23,11 @@ import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 
 /**
  * <p>Concrete implementation of <code>HttpServletRequest</code> that
Index: struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/CheckLogonTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/CheckLogonTag.java
+++ struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/CheckLogonTag.java
@@ -18,9 +18,9 @@
 package org.apache.struts.webapp.example;
 
 
-import javax.servlet.http.HttpSession;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.TagSupport;
 
 
 /**
Index: struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/EditRegistrationAction.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/EditRegistrationAction.java
+++ struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/EditRegistrationAction.java
@@ -20,10 +20,10 @@ package org.apache.struts.webapp.example
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Locale;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/EditSubscriptionAction.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/EditSubscriptionAction.java
+++ struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/EditSubscriptionAction.java
@@ -20,10 +20,10 @@ package org.apache.struts.webapp.example
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Locale;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/LinkUserTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/LinkUserTag.java
+++ struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/LinkUserTag.java
@@ -20,11 +20,11 @@ package org.apache.struts.webapp.example
 
 import java.io.IOException;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.TagSupport;
 
 import org.apache.struts.util.MessageResources;
 import org.apache.struts.util.ResponseUtils;
Index: struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/LogoffAction.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/LogoffAction.java
+++ struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/LogoffAction.java
@@ -19,9 +19,9 @@ package org.apache.struts.webapp.example
 
 
 import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts.action.Action;
Index: struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/LogonAction.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/LogonAction.java
+++ struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/LogonAction.java
@@ -19,9 +19,9 @@ package org.apache.struts.webapp.example
 
 
 import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts.action.Action;
Index: struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/LogonForm.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/LogonForm.java
+++ struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/LogonForm.java
@@ -18,7 +18,7 @@
 package org.apache.struts.webapp.example;
 
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.struts.action.ActionError;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
Index: struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/RegistrationForm.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/RegistrationForm.java
+++ struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/RegistrationForm.java
@@ -18,7 +18,7 @@
 package org.apache.struts.webapp.example;
 
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.struts.action.ActionError;
 import org.apache.struts.action.ActionErrors;
Index: struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/SaveRegistrationAction.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/SaveRegistrationAction.java
+++ struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/SaveRegistrationAction.java
@@ -21,10 +21,10 @@ package org.apache.struts.webapp.example
 import java.lang.reflect.InvocationTargetException;
 import java.util.Locale;
 
-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 org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.logging.Log;
Index: struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/SaveSubscriptionAction.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/SaveSubscriptionAction.java
+++ struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/SaveSubscriptionAction.java
@@ -21,10 +21,10 @@ package org.apache.struts.webapp.example
 import java.lang.reflect.InvocationTargetException;
 import java.util.Locale;
 
-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 org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.logging.Log;
Index: struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/SubscriptionForm.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/SubscriptionForm.java
+++ struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/SubscriptionForm.java
@@ -18,7 +18,7 @@
 package org.apache.struts.webapp.example;
 
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.struts.action.ActionError;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
Index: struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/memory/MemoryDatabasePlugIn.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/memory/MemoryDatabasePlugIn.java
+++ struts-1.2.9-src/contrib/struts-faces/example1-webapp/src/java/org/apache/struts/webapp/example/memory/MemoryDatabasePlugIn.java
@@ -24,7 +24,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts.action.ActionServlet;
@@ -216,7 +216,7 @@ public final class MemoryDatabasePlugIn
         // Does a copy of this file already exist in our temporary directory
         File dir = (File)
             servlet.getServletContext().getAttribute
-            ("javax.servlet.context.tempdir");
+            ("jakarta.servlet.context.tempdir");
         File file = new File(dir, "struts-example-database.xml");
         if (file.exists()) {
             return (file.getAbsolutePath());
Index: struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/CheckLogonTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/CheckLogonTag.java
+++ struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/CheckLogonTag.java
@@ -18,9 +18,9 @@
 package org.apache.struts.webapp.example2;
 
 
-import javax.servlet.http.HttpSession;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.TagSupport;
 
 
 /**
Index: struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/EditRegistrationAction.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/EditRegistrationAction.java
+++ struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/EditRegistrationAction.java
@@ -20,10 +20,10 @@ package org.apache.struts.webapp.example
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Locale;
-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 org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/EditSubscriptionAction.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/EditSubscriptionAction.java
+++ struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/EditSubscriptionAction.java
@@ -20,10 +20,10 @@ package org.apache.struts.webapp.example
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Locale;
-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 org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/LinkUserTag.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/LinkUserTag.java
+++ struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/LinkUserTag.java
@@ -19,11 +19,11 @@ package org.apache.struts.webapp.example
 
 
 import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.TagSupport;
 import org.apache.struts.util.MessageResources;
 import org.apache.struts.util.ResponseUtils;
 
Index: struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/LogoffAction.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/LogoffAction.java
+++ struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/LogoffAction.java
@@ -19,9 +19,9 @@ package org.apache.struts.webapp.example
 
 
 import java.util.Locale;
-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 org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts.action.Action;
Index: struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/LogonAction.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/LogonAction.java
+++ struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/LogonAction.java
@@ -19,9 +19,9 @@ package org.apache.struts.webapp.example
 
 
 import java.util.Locale;
-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 org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/LogonForm.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/LogonForm.java
+++ struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/LogonForm.java
@@ -18,7 +18,7 @@
 package org.apache.struts.webapp.example2;
 
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.struts.action.ActionError;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
Index: struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/RegistrationForm.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/RegistrationForm.java
+++ struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/RegistrationForm.java
@@ -18,7 +18,7 @@
 package org.apache.struts.webapp.example2;
 
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.struts.action.ActionError;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionMapping;
Index: struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/SaveRegistrationAction.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/SaveRegistrationAction.java
+++ struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/SaveRegistrationAction.java
@@ -20,10 +20,10 @@ package org.apache.struts.webapp.example
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Locale;
-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 org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/SaveSubscriptionAction.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/SaveSubscriptionAction.java
+++ struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/SaveSubscriptionAction.java
@@ -20,10 +20,10 @@ package org.apache.struts.webapp.example
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Locale;
-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 org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/SubscriptionForm.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/SubscriptionForm.java
+++ struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/SubscriptionForm.java
@@ -18,7 +18,7 @@
 package org.apache.struts.webapp.example2;
 
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.struts.action.ActionError;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
Index: struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/memory/MemoryDatabasePlugIn.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/memory/MemoryDatabasePlugIn.java
+++ struts-1.2.9-src/contrib/struts-faces/example2-webapp/src/java/org/apache/struts/webapp/example2/memory/MemoryDatabasePlugIn.java
@@ -24,7 +24,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts.action.ActionServlet;
@@ -216,7 +216,7 @@ public final class MemoryDatabasePlugIn
         // Does a copy of this file already exist in our temporary directory
         File dir = (File)
             servlet.getServletContext().getAttribute
-            ("javax.servlet.context.tempdir");
+            ("jakarta.servlet.context.tempdir");
         File file = new File(dir, "struts-example-database.xml");
         if (file.exists()) {
             return (file.getAbsolutePath());
Index: struts-1.2.9-src/contrib/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest1/ContextAction.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest1/ContextAction.java
+++ struts-1.2.9-src/contrib/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest1/ContextAction.java
@@ -19,8 +19,8 @@
 package org.apache.struts.faces.systest1;
 
 import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/contrib/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest1/LogonAction.java
===================================================================
--- struts-1.2.9-src.orig/contrib/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest1/LogonAction.java
+++ struts-1.2.9-src/contrib/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest1/LogonAction.java
@@ -18,8 +18,8 @@
 
 package org.apache.struts.faces.systest1;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.logging.Log;
Index: struts-1.2.9-src/project.xml
===================================================================
--- struts-1.2.9-src.orig/project.xml
+++ struts-1.2.9-src/project.xml
@@ -269,9 +269,9 @@
       </properties>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.2</version>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.1.0</version>
       <properties>
         <scope>provided</scope>
       </properties>
Index: struts-1.2.9-src/src/example/org/apache/struts/webapp/example/BaseAction.java
===================================================================
--- struts-1.2.9-src.orig/src/example/org/apache/struts/webapp/example/BaseAction.java
+++ struts-1.2.9-src/src/example/org/apache/struts/webapp/example/BaseAction.java
@@ -24,7 +24,7 @@ import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.webapp.example.UserDatabase;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * Base Action for MailReader application.
Index: struts-1.2.9-src/src/example/org/apache/struts/webapp/example/CheckLogonTag.java
===================================================================
--- struts-1.2.9-src.orig/src/example/org/apache/struts/webapp/example/CheckLogonTag.java
+++ struts-1.2.9-src/src/example/org/apache/struts/webapp/example/CheckLogonTag.java
@@ -20,10 +20,10 @@ package org.apache.struts.webapp.example
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpSession;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.TagSupport;
 import org.apache.struts.config.ModuleConfig;
 
 
Index: struts-1.2.9-src/src/example/org/apache/struts/webapp/example/EditRegistrationAction.java
===================================================================
--- struts-1.2.9-src.orig/src/example/org/apache/struts/webapp/example/EditRegistrationAction.java
+++ struts-1.2.9-src/src/example/org/apache/struts/webapp/example/EditRegistrationAction.java
@@ -20,10 +20,10 @@ package org.apache.struts.webapp.example
 
 import java.lang.reflect.InvocationTargetException;
 
-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 org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.logging.Log;
Index: struts-1.2.9-src/src/example/org/apache/struts/webapp/example/EditSubscriptionAction.java
===================================================================
--- struts-1.2.9-src.orig/src/example/org/apache/struts/webapp/example/EditSubscriptionAction.java
+++ struts-1.2.9-src/src/example/org/apache/struts/webapp/example/EditSubscriptionAction.java
@@ -20,10 +20,10 @@ package org.apache.struts.webapp.example
 
 import java.lang.reflect.InvocationTargetException;
 
-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 org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.logging.Log;
Index: struts-1.2.9-src/src/example/org/apache/struts/webapp/example/LinkSubscriptionTag.java
===================================================================
--- struts-1.2.9-src.orig/src/example/org/apache/struts/webapp/example/LinkSubscriptionTag.java
+++ struts-1.2.9-src/src/example/org/apache/struts/webapp/example/LinkSubscriptionTag.java
@@ -22,11 +22,11 @@ package org.apache.struts.webapp.example
 
 import java.io.IOException;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.TagSupport;
 
 import org.apache.struts.config.ModuleConfig;
 import org.apache.struts.taglib.TagUtils;
Index: struts-1.2.9-src/src/example/org/apache/struts/webapp/example/LinkUserTag.java
===================================================================
--- struts-1.2.9-src.orig/src/example/org/apache/struts/webapp/example/LinkUserTag.java
+++ struts-1.2.9-src/src/example/org/apache/struts/webapp/example/LinkUserTag.java
@@ -22,11 +22,11 @@ package org.apache.struts.webapp.example
 
 import java.io.IOException;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.TagSupport;
 
 import org.apache.struts.config.ModuleConfig;
 import org.apache.struts.taglib.TagUtils;
Index: struts-1.2.9-src/src/example/org/apache/struts/webapp/example/LocaleAction.java
===================================================================
--- struts-1.2.9-src.orig/src/example/org/apache/struts/webapp/example/LocaleAction.java
+++ struts-1.2.9-src/src/example/org/apache/struts/webapp/example/LocaleAction.java
@@ -19,9 +19,9 @@ package org.apache.struts.webapp.example
 
 import java.util.Locale;
 
-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 org.apache.struts.Globals;
 import org.apache.struts.action.ActionForm;
Index: struts-1.2.9-src/src/example/org/apache/struts/webapp/example/LogoffAction.java
===================================================================
--- struts-1.2.9-src.orig/src/example/org/apache/struts/webapp/example/LogoffAction.java
+++ struts-1.2.9-src/src/example/org/apache/struts/webapp/example/LogoffAction.java
@@ -18,9 +18,9 @@
 
 package org.apache.struts.webapp.example;
 
-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 org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/example/org/apache/struts/webapp/example/LogonAction.java
===================================================================
--- struts-1.2.9-src.orig/src/example/org/apache/struts/webapp/example/LogonAction.java
+++ struts-1.2.9-src/src/example/org/apache/struts/webapp/example/LogonAction.java
@@ -17,9 +17,9 @@
  */
 package org.apache.struts.webapp.example;
 
-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 org.apache.commons.beanutils.PropertyUtils;
 import org.apache.struts.action.ActionForm;
Index: struts-1.2.9-src/src/example/org/apache/struts/webapp/example/RegistrationForm.java
===================================================================
--- struts-1.2.9-src.orig/src/example/org/apache/struts/webapp/example/RegistrationForm.java
+++ struts-1.2.9-src/src/example/org/apache/struts/webapp/example/RegistrationForm.java
@@ -20,7 +20,7 @@
 package org.apache.struts.webapp.example;
 
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionMapping;
Index: struts-1.2.9-src/src/example/org/apache/struts/webapp/example/SaveRegistrationAction.java
===================================================================
--- struts-1.2.9-src.orig/src/example/org/apache/struts/webapp/example/SaveRegistrationAction.java
+++ struts-1.2.9-src/src/example/org/apache/struts/webapp/example/SaveRegistrationAction.java
@@ -20,10 +20,10 @@ package org.apache.struts.webapp.example
 
 import java.lang.reflect.InvocationTargetException;
 
-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 org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.logging.Log;
Index: struts-1.2.9-src/src/example/org/apache/struts/webapp/example/SaveSubscriptionAction.java
===================================================================
--- struts-1.2.9-src.orig/src/example/org/apache/struts/webapp/example/SaveSubscriptionAction.java
+++ struts-1.2.9-src/src/example/org/apache/struts/webapp/example/SaveSubscriptionAction.java
@@ -20,10 +20,10 @@ package org.apache.struts.webapp.example
 
 import java.lang.reflect.InvocationTargetException;
 
-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 org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.logging.Log;
Index: struts-1.2.9-src/src/example/org/apache/struts/webapp/example/SubscriptionForm.java
===================================================================
--- struts-1.2.9-src.orig/src/example/org/apache/struts/webapp/example/SubscriptionForm.java
+++ struts-1.2.9-src/src/example/org/apache/struts/webapp/example/SubscriptionForm.java
@@ -20,7 +20,7 @@
 package org.apache.struts.webapp.example;
 
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
Index: struts-1.2.9-src/src/example/org/apache/struts/webapp/example/WelcomeAction.java
===================================================================
--- struts-1.2.9-src.orig/src/example/org/apache/struts/webapp/example/WelcomeAction.java
+++ struts-1.2.9-src/src/example/org/apache/struts/webapp/example/WelcomeAction.java
@@ -18,8 +18,8 @@
 package org.apache.struts.webapp.example;
 
 import java.util.ArrayList;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.struts.webapp.example.UserDatabase;
 import org.apache.struts.util.MessageResources;
 import org.apache.struts.action.ActionForm;
Index: struts-1.2.9-src/src/example/org/apache/struts/webapp/example/memory/MemoryDatabasePlugIn.java
===================================================================
--- struts-1.2.9-src.orig/src/example/org/apache/struts/webapp/example/memory/MemoryDatabasePlugIn.java
+++ struts-1.2.9-src/src/example/org/apache/struts/webapp/example/memory/MemoryDatabasePlugIn.java
@@ -23,7 +23,7 @@ import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts.action.ActionServlet;
@@ -181,7 +181,7 @@ public final class MemoryDatabasePlugIn
         // Does a copy of this file already exist in our temporary directory
         File dir = (File)
             servlet.getServletContext().getAttribute
-            ("javax.servlet.context.tempdir");
+            ("jakarta.servlet.context.tempdir");
         File file = new File(dir, "struts-example-database.xml");
         if (file.exists()) {
             return (file.getAbsolutePath());
Index: struts-1.2.9-src/src/examples/org/apache/struts/webapp/dispatch/ActionDispatcherExample.java
===================================================================
--- struts-1.2.9-src.orig/src/examples/org/apache/struts/webapp/dispatch/ActionDispatcherExample.java
+++ struts-1.2.9-src/src/examples/org/apache/struts/webapp/dispatch/ActionDispatcherExample.java
@@ -19,8 +19,8 @@ package org.apache.struts.webapp.dispatc
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.struts.actions.ActionDispatcher;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
Index: struts-1.2.9-src/src/examples/org/apache/struts/webapp/dispatch/DispatchExampleAction.java
===================================================================
--- struts-1.2.9-src.orig/src/examples/org/apache/struts/webapp/dispatch/DispatchExampleAction.java
+++ struts-1.2.9-src/src/examples/org/apache/struts/webapp/dispatch/DispatchExampleAction.java
@@ -19,8 +19,8 @@ package org.apache.struts.webapp.dispatc
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.struts.actions.DispatchAction;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
Index: struts-1.2.9-src/src/examples/org/apache/struts/webapp/dispatch/EventActionDispatcherExample.java
===================================================================
--- struts-1.2.9-src.orig/src/examples/org/apache/struts/webapp/dispatch/EventActionDispatcherExample.java
+++ struts-1.2.9-src/src/examples/org/apache/struts/webapp/dispatch/EventActionDispatcherExample.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.webapp.dispatch;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.struts.actions.ActionDispatcher;
 import org.apache.struts.actions.EventActionDispatcher;
 import org.apache.struts.action.Action;
Index: struts-1.2.9-src/src/examples/org/apache/struts/webapp/dispatch/EventDispatchActionExample.java
===================================================================
--- struts-1.2.9-src.orig/src/examples/org/apache/struts/webapp/dispatch/EventDispatchActionExample.java
+++ struts-1.2.9-src/src/examples/org/apache/struts/webapp/dispatch/EventDispatchActionExample.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.webapp.dispatch;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.struts.actions.ActionDispatcher;
 import org.apache.struts.actions.EventDispatchAction;
 import org.apache.struts.action.Action;
Index: struts-1.2.9-src/src/examples/org/apache/struts/webapp/dispatch/LookupDispatchExampleAction.java
===================================================================
--- struts-1.2.9-src.orig/src/examples/org/apache/struts/webapp/dispatch/LookupDispatchExampleAction.java
+++ struts-1.2.9-src/src/examples/org/apache/struts/webapp/dispatch/LookupDispatchExampleAction.java
@@ -19,8 +19,8 @@ package org.apache.struts.webapp.dispatc
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.struts.actions.LookupDispatchAction;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
Index: struts-1.2.9-src/src/examples/org/apache/struts/webapp/dispatch/MappingDispatchExampleAction.java
===================================================================
--- struts-1.2.9-src.orig/src/examples/org/apache/struts/webapp/dispatch/MappingDispatchExampleAction.java
+++ struts-1.2.9-src/src/examples/org/apache/struts/webapp/dispatch/MappingDispatchExampleAction.java
@@ -19,8 +19,8 @@ package org.apache.struts.webapp.dispatc
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.struts.actions.MappingDispatchAction;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
Index: struts-1.2.9-src/src/examples/org/apache/struts/webapp/exercise/HtmlSettersAction.java
===================================================================
--- struts-1.2.9-src.orig/src/examples/org/apache/struts/webapp/exercise/HtmlSettersAction.java
+++ struts-1.2.9-src/src/examples/org/apache/struts/webapp/exercise/HtmlSettersAction.java
@@ -20,8 +20,8 @@
 package org.apache.struts.webapp.exercise;
 
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
Index: struts-1.2.9-src/src/examples/org/apache/struts/webapp/exercise/ImageAction.java
===================================================================
--- struts-1.2.9-src.orig/src/examples/org/apache/struts/webapp/exercise/ImageAction.java
+++ struts-1.2.9-src/src/examples/org/apache/struts/webapp/exercise/ImageAction.java
@@ -25,8 +25,8 @@ import org.apache.struts.action.ActionFo
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.io.OutputStream;
 
Index: struts-1.2.9-src/src/examples/org/apache/struts/webapp/exercise/SuccessAction.java
===================================================================
--- struts-1.2.9-src.orig/src/examples/org/apache/struts/webapp/exercise/SuccessAction.java
+++ struts-1.2.9-src/src/examples/org/apache/struts/webapp/exercise/SuccessAction.java
@@ -20,8 +20,8 @@
 package org.apache.struts.webapp.exercise;
 
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
Index: struts-1.2.9-src/src/examples/org/apache/struts/webapp/exercise/TestBean.java
===================================================================
--- struts-1.2.9-src.orig/src/examples/org/apache/struts/webapp/exercise/TestBean.java
+++ struts-1.2.9-src/src/examples/org/apache/struts/webapp/exercise/TestBean.java
@@ -26,7 +26,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.util.LabelValueBean;
Index: struts-1.2.9-src/src/examples/org/apache/struts/webapp/upload/UploadAction.java
===================================================================
--- struts-1.2.9-src.orig/src/examples/org/apache/struts/webapp/upload/UploadAction.java
+++ struts-1.2.9-src/src/examples/org/apache/struts/webapp/upload/UploadAction.java
@@ -26,8 +26,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
Index: struts-1.2.9-src/src/examples/org/apache/struts/webapp/upload/UploadForm.java
===================================================================
--- struts-1.2.9-src.orig/src/examples/org/apache/struts/webapp/upload/UploadForm.java
+++ struts-1.2.9-src/src/examples/org/apache/struts/webapp/upload/UploadForm.java
@@ -18,7 +18,7 @@
 
 package org.apache.struts.webapp.upload;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.struts.action.*;
 import org.apache.struts.upload.FormFile;
Index: struts-1.2.9-src/src/examples/org/apache/struts/webapp/validator/EditTypeAction.java
===================================================================
--- struts-1.2.9-src.orig/src/examples/org/apache/struts/webapp/validator/EditTypeAction.java
+++ struts-1.2.9-src/src/examples/org/apache/struts/webapp/validator/EditTypeAction.java
@@ -18,8 +18,8 @@
 
 package org.apache.struts.webapp.validator;
 
-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 org.apache.commons.logging.Log;
Index: struts-1.2.9-src/src/examples/org/apache/struts/webapp/validator/LocaleAction.java
===================================================================
--- struts-1.2.9-src.orig/src/examples/org/apache/struts/webapp/validator/LocaleAction.java
+++ struts-1.2.9-src/src/examples/org/apache/struts/webapp/validator/LocaleAction.java
@@ -21,9 +21,9 @@ package org.apache.struts.webapp.validat
 
 import java.util.Locale;
 
-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 org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.logging.Log;
Index: struts-1.2.9-src/src/examples/org/apache/struts/webapp/validator/MultiRegistrationAction.java
===================================================================
--- struts-1.2.9-src.orig/src/examples/org/apache/struts/webapp/validator/MultiRegistrationAction.java
+++ struts-1.2.9-src/src/examples/org/apache/struts/webapp/validator/MultiRegistrationAction.java
@@ -18,9 +18,9 @@
 
 package org.apache.struts.webapp.validator;
 
-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 org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/examples/org/apache/struts/webapp/validator/RegistrationAction.java
===================================================================
--- struts-1.2.9-src.orig/src/examples/org/apache/struts/webapp/validator/RegistrationAction.java
+++ struts-1.2.9-src/src/examples/org/apache/struts/webapp/validator/RegistrationAction.java
@@ -18,9 +18,9 @@
 
 package org.apache.struts.webapp.validator;
 
-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 org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/examples/org/apache/struts/webapp/validator/RegistrationForm.java
===================================================================
--- struts-1.2.9-src.orig/src/examples/org/apache/struts/webapp/validator/RegistrationForm.java
+++ struts-1.2.9-src/src/examples/org/apache/struts/webapp/validator/RegistrationForm.java
@@ -20,7 +20,7 @@
 package org.apache.struts.webapp.validator;
 
 import java.io.Serializable;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.validator.ValidatorForm;
 
Index: struts-1.2.9-src/src/examples/org/apache/struts/webapp/validator/TypeAction.java
===================================================================
--- struts-1.2.9-src.orig/src/examples/org/apache/struts/webapp/validator/TypeAction.java
+++ struts-1.2.9-src/src/examples/org/apache/struts/webapp/validator/TypeAction.java
@@ -18,9 +18,9 @@
 
 package org.apache.struts.webapp.validator;
 
-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 org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/examples/org/apache/struts/webapp/validator/TypeForm.java
===================================================================
--- struts-1.2.9-src.orig/src/examples/org/apache/struts/webapp/validator/TypeForm.java
+++ struts-1.2.9-src/src/examples/org/apache/struts/webapp/validator/TypeForm.java
@@ -22,7 +22,7 @@ package org.apache.struts.webapp.validat
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.util.LabelValueBean;
 import org.apache.struts.validator.ValidatorForm;
Index: struts-1.2.9-src/src/share/org/apache/struts/action/Action.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/action/Action.java
+++ struts-1.2.9-src/src/share/org/apache/struts/action/Action.java
@@ -20,12 +20,12 @@ package org.apache.struts.action;
 
 import java.util.Locale;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import javax.sql.DataSource;
 
 import org.apache.struts.Globals;
Index: struts-1.2.9-src/src/share/org/apache/struts/action/ActionForm.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/action/ActionForm.java
+++ struts-1.2.9-src/src/share/org/apache/struts/action/ActionForm.java
@@ -21,8 +21,8 @@ package org.apache.struts.action;
 
 
 import java.io.Serializable;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.struts.upload.MultipartRequestHandler;
 
Index: struts-1.2.9-src/src/share/org/apache/struts/action/ActionServlet.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/action/ActionServlet.java
+++ struts-1.2.9-src/src/share/org/apache/struts/action/ActionServlet.java
@@ -29,12 +29,12 @@ import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.MissingResourceException;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.UnavailableException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.UnavailableException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import javax.sql.DataSource;
 
 import org.apache.commons.beanutils.BeanUtils;
Index: struts-1.2.9-src/src/share/org/apache/struts/action/DynaActionForm.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/action/DynaActionForm.java
+++ struts-1.2.9-src/src/share/org/apache/struts/action/DynaActionForm.java
@@ -24,8 +24,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.commons.beanutils.ConversionException;
 import org.apache.commons.beanutils.DynaBean;
Index: struts-1.2.9-src/src/share/org/apache/struts/action/ExceptionHandler.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/action/ExceptionHandler.java
+++ struts-1.2.9-src/src/share/org/apache/struts/action/ExceptionHandler.java
@@ -18,9 +18,9 @@
  
 package org.apache.struts.action;
 
-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.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/action/PlugIn.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/action/PlugIn.java
+++ struts-1.2.9-src/src/share/org/apache/struts/action/PlugIn.java
@@ -20,7 +20,7 @@
 package org.apache.struts.action;
 
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.struts.config.ModuleConfig;
 
 
Index: struts-1.2.9-src/src/share/org/apache/struts/action/RequestProcessor.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/action/RequestProcessor.java
+++ struts-1.2.9-src/src/share/org/apache/struts/action/RequestProcessor.java
@@ -23,12 +23,12 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Locale;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -63,7 +63,7 @@ public class RequestProcessor {
      * processing during a <code>RequestDispatcher.include</code> call.</p>
      */
     public static final String INCLUDE_PATH_INFO =
-        "javax.servlet.include.path_info";
+        "jakarta.servlet.include.path_info";
 
 
     /**
@@ -71,7 +71,7 @@ public class RequestProcessor {
      * for processing during a <code>RequestDispatcher.include</code> call.</p>
      */
     public static final String INCLUDE_SERVLET_PATH =
-        "javax.servlet.include.servlet_path";
+        "jakarta.servlet.include.servlet_path";
 
 
     // ----------------------------------------------------- Instance Variables
Index: struts-1.2.9-src/src/share/org/apache/struts/actions/ActionDispatcher.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/actions/ActionDispatcher.java
+++ struts-1.2.9-src/src/share/org/apache/struts/actions/ActionDispatcher.java
@@ -22,9 +22,9 @@ import java.lang.reflect.InvocationTarge
 import java.lang.reflect.Method;
 import java.util.HashMap;
 
-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.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/actions/DispatchAction.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/actions/DispatchAction.java
+++ struts-1.2.9-src/src/share/org/apache/struts/actions/DispatchAction.java
@@ -22,9 +22,9 @@ import java.lang.reflect.InvocationTarge
 import java.lang.reflect.Method;
 import java.util.HashMap;
 
-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.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/actions/DownloadAction.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/actions/DownloadAction.java
+++ struts-1.2.9-src/src/share/org/apache/struts/actions/DownloadAction.java
@@ -26,9 +26,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-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.struts.action.Action;
 import org.apache.struts.action.ActionForm;
Index: struts-1.2.9-src/src/share/org/apache/struts/actions/EventActionDispatcher.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/actions/EventActionDispatcher.java
+++ struts-1.2.9-src/src/share/org/apache/struts/actions/EventActionDispatcher.java
@@ -21,9 +21,9 @@ package org.apache.struts.actions;
 import java.util.StringTokenizer;
 import java.lang.reflect.Method;
 
-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.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/actions/EventDispatchAction.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/actions/EventDispatchAction.java
+++ struts-1.2.9-src/src/share/org/apache/struts/actions/EventDispatchAction.java
@@ -19,9 +19,9 @@ package org.apache.struts.actions;
 
 import java.util.StringTokenizer;
 
-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.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/actions/ForwardAction.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/actions/ForwardAction.java
+++ struts-1.2.9-src/src/share/org/apache/struts/actions/ForwardAction.java
@@ -18,9 +18,9 @@
 
 package org.apache.struts.actions;
 
-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.struts.action.Action;
 import org.apache.struts.action.ActionForm;
Index: struts-1.2.9-src/src/share/org/apache/struts/actions/IncludeAction.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/actions/IncludeAction.java
+++ struts-1.2.9-src/src/share/org/apache/struts/actions/IncludeAction.java
@@ -18,10 +18,10 @@
  
 package org.apache.struts.actions;
 
-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.struts.action.Action;
 import org.apache.struts.action.ActionForm;
Index: struts-1.2.9-src/src/share/org/apache/struts/actions/LocaleAction.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/actions/LocaleAction.java
+++ struts-1.2.9-src/src/share/org/apache/struts/actions/LocaleAction.java
@@ -21,9 +21,9 @@ package org.apache.struts.actions;
 
 import java.util.Locale;
 
-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 org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.logging.Log;
Index: struts-1.2.9-src/src/share/org/apache/struts/actions/LookupDispatchAction.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/actions/LookupDispatchAction.java
+++ struts-1.2.9-src/src/share/org/apache/struts/actions/LookupDispatchAction.java
@@ -23,9 +23,9 @@ import java.util.Iterator;
 import java.util.Locale;
 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.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/actions/MappingDispatchAction.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/actions/MappingDispatchAction.java
+++ struts-1.2.9-src/src/share/org/apache/struts/actions/MappingDispatchAction.java
@@ -18,9 +18,9 @@
 
 package org.apache.struts.actions;
 
-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.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/actions/RedeployableActionServlet.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/actions/RedeployableActionServlet.java
+++ struts-1.2.9-src/src/share/org/apache/struts/actions/RedeployableActionServlet.java
@@ -1,6 +1,6 @@
 package org.apache.struts.actions;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import org.apache.struts.Globals;
 import org.apache.struts.action.ActionServlet;
Index: struts-1.2.9-src/src/share/org/apache/struts/actions/SwitchAction.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/actions/SwitchAction.java
+++ struts-1.2.9-src/src/share/org/apache/struts/actions/SwitchAction.java
@@ -18,9 +18,9 @@
 
 package org.apache.struts.actions;
 
-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.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/config/ConfigHelper.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/config/ConfigHelper.java
+++ struts-1.2.9-src/src/share/org/apache/struts/config/ConfigHelper.java
@@ -18,10 +18,10 @@
 
 package org.apache.struts.config;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import javax.sql.DataSource;
 
 import org.apache.struts.Globals;
Index: struts-1.2.9-src/src/share/org/apache/struts/plugins/DigestingPlugIn.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/plugins/DigestingPlugIn.java
+++ struts-1.2.9-src/src/share/org/apache/struts/plugins/DigestingPlugIn.java
@@ -22,7 +22,7 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import org.apache.commons.digester.Digester;
 import org.apache.commons.digester.RuleSet;
Index: struts-1.2.9-src/src/share/org/apache/struts/plugins/ModuleConfigVerifier.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/plugins/ModuleConfigVerifier.java
+++ struts-1.2.9-src/src/share/org/apache/struts/plugins/ModuleConfigVerifier.java
@@ -20,7 +20,7 @@
 package org.apache.struts.plugins;
 
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import org.apache.struts.action.ActionServlet;
 import org.apache.struts.action.PlugIn;
 import org.apache.struts.config.ForwardConfig;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/TagUtils.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/TagUtils.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/TagUtils.java
@@ -26,13 +26,13 @@ import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyContent;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyContent;
 
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.logging.Log;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/CookieTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/bean/CookieTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/CookieTag.java
@@ -21,10 +21,10 @@ package org.apache.struts.taglib.bean;
 
 
 import java.util.ArrayList;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.TagSupport;
 import org.apache.struts.util.MessageResources;
 import org.apache.struts.taglib.TagUtils;
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/CookieTei.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/bean/CookieTei.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/CookieTei.java
@@ -20,9 +20,9 @@
 package org.apache.struts.taglib.bean;
 
 
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.VariableInfo;
 
 
 /**
@@ -42,9 +42,9 @@ public class CookieTei extends TagExtraI
 
         String className = null;
         if (data.getAttribute("multiple") == null)
-            className = "javax.servlet.http.Cookie";
+            className = "jakarta.servlet.http.Cookie";
         else
-            className = "javax.servlet.http.Cookie[]";
+            className = "jakarta.servlet.http.Cookie[]";
 	return new VariableInfo[] {
 	  new VariableInfo(data.getAttributeString("id"),
 	                   className,
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/DefineTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/bean/DefineTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/DefineTag.java
@@ -20,9 +20,9 @@
 package org.apache.struts.taglib.bean;
 
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
 
 import org.apache.struts.taglib.TagUtils;
 import org.apache.struts.util.MessageResources;
@@ -172,7 +172,7 @@ public class DefineTag extends BodyTagSu
      */
     public int doStartTag() throws JspException {
        
-        return (EVAL_BODY_TAG);
+        return (EVAL_BODY_BUFFERED);
 
     }
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/DefineTei.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/bean/DefineTei.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/DefineTei.java
@@ -20,9 +20,9 @@
 package org.apache.struts.taglib.bean;
 
 
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.VariableInfo;
 
 
 /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/HeaderTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/bean/HeaderTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/HeaderTag.java
@@ -21,9 +21,9 @@ package org.apache.struts.taglib.bean;
 import java.util.ArrayList;
 import java.util.Enumeration;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.TagSupport;
 
 import org.apache.struts.util.MessageResources;
 import org.apache.struts.taglib.TagUtils;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/HeaderTei.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/bean/HeaderTei.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/HeaderTei.java
@@ -20,9 +20,9 @@
 package org.apache.struts.taglib.bean;
 
 
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.VariableInfo;
 
 
 /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/IncludeTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/bean/IncludeTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/IncludeTag.java
@@ -25,9 +25,9 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.TagSupport;
 import org.apache.struts.util.MessageResources;
 import org.apache.struts.util.RequestUtils;
 import org.apache.struts.taglib.TagUtils;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/IncludeTei.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/bean/IncludeTei.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/IncludeTei.java
@@ -20,9 +20,9 @@
 package org.apache.struts.taglib.bean;
 
 
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.VariableInfo;
 
 
 /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/MessageTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/bean/MessageTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/MessageTag.java
@@ -20,8 +20,8 @@ package org.apache.struts.taglib.bean;
 
 import java.util.Locale;
 
-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.struts.Globals;
 import org.apache.struts.taglib.TagUtils;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/PageTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/bean/PageTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/PageTag.java
@@ -20,8 +20,8 @@
 package org.apache.struts.taglib.bean;
 
 
-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.struts.util.MessageResources;
 import org.apache.struts.taglib.TagUtils;
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/PageTei.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/bean/PageTei.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/PageTei.java
@@ -20,9 +20,9 @@
 package org.apache.struts.taglib.bean;
 
 
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.VariableInfo;
 
 
 /**
@@ -43,15 +43,15 @@ public class PageTei extends TagExtraInf
         String type = null;
         String property = data.getAttributeString("property");
         if ("application".equalsIgnoreCase(property))
-            type = "javax.servlet.ServletContext";
+            type = "jakarta.servlet.ServletContext";
         else if ("config".equalsIgnoreCase(property))
-            type = "javax.servlet.ServletConfig";
+            type = "jakarta.servlet.ServletConfig";
         else if ("request".equalsIgnoreCase(property))
-            type = "javax.servlet.ServletRequest";
+            type = "jakarta.servlet.ServletRequest";
         else if ("response".equalsIgnoreCase(property))
-            type = "javax.servlet.ServletResponse";
+            type = "jakarta.servlet.ServletResponse";
         else if ("session".equalsIgnoreCase(property))
-            type = "javax.servlet.http.HttpSession";
+            type = "jakarta.servlet.http.HttpSession";
         else
             type = "java.lang.Object";
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/ParameterTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/bean/ParameterTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/ParameterTag.java
@@ -18,8 +18,8 @@
 
 package org.apache.struts.taglib.bean;
 
-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.struts.util.MessageResources;
 import org.apache.struts.taglib.TagUtils;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/ParameterTei.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/bean/ParameterTei.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/ParameterTei.java
@@ -20,9 +20,9 @@
 package org.apache.struts.taglib.bean;
 
 
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.VariableInfo;
 
 
 /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/ResourceTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/bean/ResourceTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/ResourceTag.java
@@ -22,8 +22,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
-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.struts.util.MessageResources;
 import org.apache.struts.taglib.TagUtils;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/ResourceTei.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/bean/ResourceTei.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/ResourceTei.java
@@ -20,9 +20,9 @@
 package org.apache.struts.taglib.bean;
 
 
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.VariableInfo;
 
 
 /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/SizeTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/bean/SizeTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/SizeTag.java
@@ -23,9 +23,9 @@ package org.apache.struts.taglib.bean;
 import java.lang.reflect.Array;
 import java.util.Collection;
 import java.util.Map;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.TagSupport;
 import org.apache.struts.util.MessageResources;
 import org.apache.struts.taglib.TagUtils;
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/SizeTei.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/bean/SizeTei.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/SizeTei.java
@@ -20,9 +20,9 @@
 package org.apache.struts.taglib.bean;
 
 
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.VariableInfo;
 
 
 /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/StrutsTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/bean/StrutsTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/StrutsTag.java
@@ -20,8 +20,8 @@
 package org.apache.struts.taglib.bean;
 
 
-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.struts.config.ModuleConfig;
 import org.apache.struts.taglib.TagUtils;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/StrutsTei.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/bean/StrutsTei.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/StrutsTei.java
@@ -20,9 +20,9 @@
 package org.apache.struts.taglib.bean;
 
 
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.VariableInfo;
 
 
 /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/WriteTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/bean/WriteTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/WriteTag.java
@@ -26,8 +26,8 @@ import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.Locale;
 
-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.struts.taglib.TagUtils;
 import org.apache.struts.util.MessageResources;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/package.html
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/bean/package.html
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/bean/package.html
@@ -309,7 +309,7 @@ Bean Tags Reference</a>
 scope, for the remainder of the current page.</p>
   
 <p><em>Copy A Cookie</em> - You can create a new bean containing a <code>
-javax.servlet.http.Cookie</code> that was included in the current request.
+jakarta.servlet.http.Cookie</code> that was included in the current request.
  If no cookie of the specified name was included, a request time expression
 will be thrown - therefore, it is common to nest the use of this tag inside
 a <code>&lt;logic:present cookie="xxx"&gt;</code> tag to ensure that the
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/BaseFieldTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/BaseFieldTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/BaseFieldTag.java
@@ -18,7 +18,7 @@
 
 package org.apache.struts.taglib.html;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.TagUtils;
 
@@ -80,7 +80,7 @@ public abstract class BaseFieldTag exten
         
         TagUtils.getInstance().write(this.pageContext, this.renderInputElement());
 
-        return (EVAL_BODY_TAG);
+        return (EVAL_BODY_BUFFERED);
 
     }
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java
@@ -22,9 +22,9 @@ import java.lang.reflect.InvocationTarge
 import java.lang.reflect.Method;
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.logging.Log;
@@ -627,14 +627,14 @@ public abstract class BaseHandlerTag ext
             try {
                 loopTagSupportClass =
                     RequestUtils.applicationClass(
-                        "javax.servlet.jsp.jstl.core.LoopTagSupport");
+                        "jakarta.servlet.jsp.jstl.core.LoopTagSupport");
 
                 loopTagSupportGetStatus =
                     loopTagSupportClass.getDeclaredMethod("getLoopStatus", null);
 
                 loopTagStatusClass =
                     RequestUtils.applicationClass(
-                        "javax.servlet.jsp.jstl.core.LoopTagStatus");
+                        "jakarta.servlet.jsp.jstl.core.LoopTagStatus");
 
                 loopTagStatusGetIndex =
                     loopTagStatusClass.getDeclaredMethod("getIndex", null);
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/BaseInputTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/BaseInputTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/BaseInputTag.java
@@ -18,7 +18,7 @@
 
 package org.apache.struts.taglib.html;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 import org.apache.struts.util.MessageResources;
 
 /**
@@ -208,7 +208,7 @@ public abstract class BaseInputTag exten
      */
     public int doStartTag() throws JspException {
 
-        return (EVAL_BODY_TAG);
+        return (EVAL_BODY_BUFFERED);
 
     }
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/BaseTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/BaseTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/BaseTag.java
@@ -20,11 +20,11 @@ package org.apache.struts.taglib.html;
 
 import java.io.IOException;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.TagSupport;
 
 import org.apache.struts.Globals;
 import org.apache.struts.taglib.TagUtils;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/CancelTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/CancelTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/CancelTag.java
@@ -19,7 +19,7 @@
 
 package org.apache.struts.taglib.html;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 
 /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/CheckboxTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/CheckboxTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/CheckboxTag.java
@@ -18,7 +18,7 @@
 
 package org.apache.struts.taglib.html;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.TagUtils;
 import org.apache.struts.util.MessageResources;
@@ -140,7 +140,7 @@ public class CheckboxTag extends BaseHan
 
         // Continue processing this page
         this.text = null;
-        return (EVAL_BODY_TAG);
+        return (EVAL_BODY_BUFFERED);
 
     }
     
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/ErrorsTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/ErrorsTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/ErrorsTag.java
@@ -21,8 +21,8 @@ package org.apache.struts.taglib.html;
 import java.util.Iterator;
 import java.util.Locale;
 
-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.struts.Globals;
 import org.apache.struts.action.ActionMessage;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/FormTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/FormTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/FormTag.java
@@ -20,13 +20,13 @@ package org.apache.struts.taglib.html;
 
 import java.io.IOException;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.TagSupport;
 
 import org.apache.struts.Globals;
 import org.apache.struts.action.ActionForm;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/FrameTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/FrameTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/FrameTag.java
@@ -18,7 +18,7 @@
 
 package org.apache.struts.taglib.html;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.TagUtils;
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/HiddenTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/HiddenTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/HiddenTag.java
@@ -18,7 +18,7 @@
 
 package org.apache.struts.taglib.html;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.TagUtils;
 
@@ -76,7 +76,7 @@ public class HiddenTag extends BaseField
 
         // Is rendering the value separately requested?
         if (!write) {
-            return (EVAL_BODY_TAG);
+            return (EVAL_BODY_BUFFERED);
         }
 
 
@@ -96,7 +96,7 @@ public class HiddenTag extends BaseField
         }
 
         TagUtils.getInstance().write(pageContext, results);
-        return (EVAL_BODY_TAG);
+        return (EVAL_BODY_BUFFERED);
 
     }
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/HtmlTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/HtmlTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/HtmlTag.java
@@ -20,11 +20,11 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.TagSupport;
 
 import org.apache.struts.Globals;
 import org.apache.struts.taglib.TagUtils;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/ImageTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/ImageTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/ImageTag.java
@@ -20,9 +20,9 @@
 package org.apache.struts.taglib.html;
 
 
-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 org.apache.struts.Globals;
 import org.apache.struts.config.ModuleConfig;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/ImgTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/ImgTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/ImgTag.java
@@ -21,9 +21,9 @@ package org.apache.struts.taglib.html;
 import java.util.Iterator;
 import java.util.Map;
 
-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 org.apache.struts.Globals;
 import org.apache.struts.config.ModuleConfig;
@@ -424,7 +424,7 @@ public class ImgTag extends BaseHandlerT
     public int doStartTag() throws JspException {
 
         // Evaluate the body of this tag
-        return (EVAL_BODY_TAG);
+        return (EVAL_BODY_BUFFERED);
 
     }
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java
@@ -28,12 +28,12 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
 
 import org.apache.commons.validator.Field;
 import org.apache.commons.validator.Form;
@@ -353,7 +353,7 @@ public class JavascriptValidatorTag exte
             throw new JspException(e.getMessage());
         }
 
-        return EVAL_BODY_TAG;
+        return EVAL_BODY_BUFFERED;
 
     }
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/LinkTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/LinkTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/LinkTag.java
@@ -22,7 +22,7 @@ import java.net.MalformedURLException;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.TagUtils;
 import org.apache.struts.taglib.logic.IterateTag;
@@ -352,7 +352,7 @@ public class LinkTag extends BaseHandler
 
         // Evaluate the body of this tag
         this.text = null;
-        return (EVAL_BODY_TAG);
+        return (EVAL_BODY_BUFFERED);
 
     }
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/MessagesTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/MessagesTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/MessagesTag.java
@@ -20,8 +20,8 @@ package org.apache.struts.taglib.html;
 
 import java.util.Iterator;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
 
 import org.apache.struts.Globals;
 import org.apache.struts.action.ActionMessage;
@@ -232,7 +232,7 @@ public class MessagesTag extends BodyTag
         // doEndTag() knows processing took place
         processed = true;
 
-        return (EVAL_BODY_TAG);
+        return (EVAL_BODY_BUFFERED);
     }
 
     /**
@@ -269,7 +269,7 @@ public class MessagesTag extends BodyTag
                pageContext.setAttribute(id, msg);
            }
 
-           return (EVAL_BODY_TAG);
+           return (EVAL_BODY_BUFFERED);
         } else {
            return (SKIP_BODY);
         }
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/MessagesTei.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/MessagesTei.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/MessagesTei.java
@@ -19,9 +19,9 @@
 
 package org.apache.struts.taglib.html;
 
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.VariableInfo;
 
 
 /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/MultiboxTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/MultiboxTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/MultiboxTag.java
@@ -20,8 +20,8 @@ package org.apache.struts.taglib.html;
 
 import java.lang.reflect.InvocationTargetException;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.struts.Globals;
@@ -131,7 +131,7 @@ public class MultiboxTag extends BaseHan
 
         // Defer processing until the end of this tag is encountered
         this.constant = null;
-        return (EVAL_BODY_TAG);
+        return (EVAL_BODY_BUFFERED);
 
     }
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/OptionTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/OptionTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/OptionTag.java
@@ -20,8 +20,8 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
 
 import org.apache.struts.Globals;
 import org.apache.struts.taglib.TagUtils;
@@ -192,7 +192,7 @@ public class OptionTag extends BodyTagSu
         this.text = null;
 
         // Do nothing until doEndTag() is called
-        return (EVAL_BODY_TAG);
+        return (EVAL_BODY_BUFFERED);
 
     }
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/OptionsCollectionTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/OptionsCollectionTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/OptionsCollectionTag.java
@@ -25,8 +25,8 @@ import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.Map;
 
-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.commons.beanutils.PropertyUtils;
 import org.apache.struts.util.IteratorAdapter;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/OptionsTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/OptionsTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/OptionsTag.java
@@ -25,8 +25,8 @@ import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.Map;
 
-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.commons.beanutils.PropertyUtils;
 import org.apache.struts.util.IteratorAdapter;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/RadioTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/RadioTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/RadioTag.java
@@ -18,7 +18,7 @@
 
 package org.apache.struts.taglib.html;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.TagUtils;
 import org.apache.struts.util.MessageResources;
@@ -168,7 +168,7 @@ public class RadioTag extends BaseHandle
         TagUtils.getInstance().write(pageContext, radioTag);
 
         this.text = null;
-        return (EVAL_BODY_TAG);
+        return (EVAL_BODY_BUFFERED);
     }
 
     /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/ResetTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/ResetTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/ResetTag.java
@@ -18,7 +18,7 @@
 
 package org.apache.struts.taglib.html;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 /**
  * Tag for input fields of type "reset".
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/RewriteTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/RewriteTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/RewriteTag.java
@@ -21,7 +21,7 @@ package org.apache.struts.taglib.html;
 import java.net.MalformedURLException;
 import java.util.Map;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.TagUtils;
 import org.apache.struts.util.ResponseUtils;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/SelectTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/SelectTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/SelectTag.java
@@ -20,7 +20,7 @@ package org.apache.struts.taglib.html;
 
 import java.lang.reflect.InvocationTargetException;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.struts.taglib.TagUtils;
@@ -199,7 +199,7 @@ public class SelectTag extends BaseHandl
 
         this.calculateMatchValues();
 
-        return (EVAL_BODY_TAG);
+        return (EVAL_BODY_BUFFERED);
     }
 
     /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/SubmitTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/SubmitTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/SubmitTag.java
@@ -18,7 +18,7 @@
 
 package org.apache.struts.taglib.html;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.TagUtils;
 import org.apache.struts.util.MessageResources;
@@ -118,7 +118,7 @@ public class SubmitTag extends BaseHandl
 
         // Do nothing until doEndTag() is called
         this.text = null;
-        return (EVAL_BODY_TAG);
+        return (EVAL_BODY_BUFFERED);
 
     }
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/TextareaTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/TextareaTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/TextareaTag.java
@@ -18,7 +18,7 @@
 
 package org.apache.struts.taglib.html;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.TagUtils;
 
@@ -50,7 +50,7 @@ public class TextareaTag extends BaseInp
         
         TagUtils.getInstance().write(pageContext, this.renderTextareaElement());
 
-        return (EVAL_BODY_TAG);
+        return (EVAL_BODY_BUFFERED);
     }
 
     /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/html/XhtmlTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/html/XhtmlTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/html/XhtmlTag.java
@@ -18,9 +18,9 @@
  
 package org.apache.struts.taglib.html;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.TagSupport;
 
 import org.apache.struts.Globals;
 
@@ -43,7 +43,7 @@ public class XhtmlTag extends TagSupport
     }
 
     /**
-     * @see javax.servlet.jsp.tagext.Tag#doEndTag()
+     * @see jakarta.servlet.jsp.tagext.Tag#doEndTag()
      */
     public int doEndTag() throws JspException {
         this.pageContext.setAttribute(Globals.XHTML_KEY, "true", PageContext.PAGE_SCOPE);
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/CompareTagBase.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/logic/CompareTagBase.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/CompareTagBase.java
@@ -21,9 +21,9 @@ package org.apache.struts.taglib.logic;
 
 
 import java.lang.reflect.InvocationTargetException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.struts.util.MessageResources;
 import org.apache.struts.taglib.TagUtils;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/ConditionalTagBase.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/logic/ConditionalTagBase.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/ConditionalTagBase.java
@@ -20,8 +20,8 @@
 package org.apache.struts.taglib.logic;
 
 
-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.struts.util.MessageResources;
 
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/EmptyTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/logic/EmptyTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/EmptyTag.java
@@ -22,7 +22,7 @@ import java.util.Collection;
 import java.util.Map;
 import java.lang.reflect.Array;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.TagUtils;
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/EqualTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/logic/EqualTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/EqualTag.java
@@ -20,7 +20,7 @@
 package org.apache.struts.taglib.logic;
 
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 
 /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/ForwardTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/logic/ForwardTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/ForwardTag.java
@@ -18,10 +18,10 @@
 
 package org.apache.struts.taglib.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.TagSupport;
 
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.config.ModuleConfig;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/GreaterEqualTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/logic/GreaterEqualTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/GreaterEqualTag.java
@@ -20,7 +20,7 @@
 package org.apache.struts.taglib.logic;
 
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 
 /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/GreaterThanTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/logic/GreaterThanTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/GreaterThanTag.java
@@ -20,7 +20,7 @@
 package org.apache.struts.taglib.logic;
 
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 
 /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/IterateTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/logic/IterateTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/IterateTag.java
@@ -26,8 +26,8 @@ import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.Map;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
 
 import org.apache.struts.util.IteratorAdapter;
 import org.apache.struts.taglib.TagUtils;
@@ -326,7 +326,7 @@ public class IterateTag extends BodyTagS
             if (indexId != null) {
                 pageContext.setAttribute(indexId, new Integer(getIndex()));
             }
-            return (EVAL_BODY_TAG);
+            return (EVAL_BODY_BUFFERED);
         } else {
             return (SKIP_BODY);
         }
@@ -363,7 +363,7 @@ public class IterateTag extends BodyTagS
             if (indexId != null) {
                 pageContext.setAttribute(indexId, new Integer(getIndex()));
             }
-            return (EVAL_BODY_TAG);
+            return (EVAL_BODY_BUFFERED);
         } else {
             return (SKIP_BODY);
         }
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/IterateTei.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/logic/IterateTei.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/IterateTei.java
@@ -17,9 +17,9 @@
  */
 package org.apache.struts.taglib.logic;
 
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.VariableInfo;
 
 /**
  * Implementation of <code>TagExtraInfo</code> for the <b>iterate</b>
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/LessEqualTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/logic/LessEqualTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/LessEqualTag.java
@@ -20,7 +20,7 @@
 package org.apache.struts.taglib.logic;
 
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 
 /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/LessThanTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/logic/LessThanTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/LessThanTag.java
@@ -20,7 +20,7 @@
 package org.apache.struts.taglib.logic;
 
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 
 /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/MatchTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/logic/MatchTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/MatchTag.java
@@ -20,9 +20,9 @@
 package org.apache.struts.taglib.logic;
 
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 import org.apache.struts.taglib.TagUtils;
 
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/MessagesNotPresentTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/logic/MessagesNotPresentTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/MessagesNotPresentTag.java
@@ -20,7 +20,7 @@
 package org.apache.struts.taglib.logic;
 
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 
 /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/MessagesPresentTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/logic/MessagesPresentTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/MessagesPresentTag.java
@@ -20,7 +20,7 @@ package org.apache.struts.taglib.logic;
 
 import java.util.Iterator;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.Globals;
 import org.apache.struts.action.ActionMessages;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/NotEmptyTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/logic/NotEmptyTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/NotEmptyTag.java
@@ -20,7 +20,7 @@
 package org.apache.struts.taglib.logic;
 
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 
 /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/NotEqualTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/logic/NotEqualTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/NotEqualTag.java
@@ -20,7 +20,7 @@
 package org.apache.struts.taglib.logic;
 
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 
 /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/NotMatchTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/logic/NotMatchTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/NotMatchTag.java
@@ -20,7 +20,7 @@
 package org.apache.struts.taglib.logic;
 
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 
 /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/NotPresentTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/logic/NotPresentTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/NotPresentTag.java
@@ -20,7 +20,7 @@
 package org.apache.struts.taglib.logic;
 
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 
 /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/PresentTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/logic/PresentTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/PresentTag.java
@@ -21,9 +21,9 @@ package org.apache.struts.taglib.logic;
 import java.security.Principal;
 import java.util.StringTokenizer;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.TagUtils;
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/RedirectTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/logic/RedirectTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/logic/RedirectTag.java
@@ -22,9 +22,9 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.TagSupport;
 
 import org.apache.struts.util.MessageResources;
 import org.apache.struts.taglib.TagUtils;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/NestedPropertyHelper.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/NestedPropertyHelper.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/NestedPropertyHelper.java
@@ -18,8 +18,8 @@
 package org.apache.struts.taglib.nested;
 
 import java.util.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.tagext.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.tagext.Tag;
 
 import org.apache.struts.taglib.html.Constants;
 import org.apache.struts.taglib.html.FormTag;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/NestedPropertyTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/NestedPropertyTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/NestedPropertyTag.java
@@ -17,9 +17,9 @@
  */
 package org.apache.struts.taglib.nested;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
 
 import org.apache.struts.taglib.TagUtils;
 
@@ -75,7 +75,7 @@ public class NestedPropertyTag extends B
     NestedPropertyHelper.setName(request, originalName);
 
     // run the body part
-    return (EVAL_BODY_TAG);
+    return (EVAL_BODY_BUFFERED);
   }
 
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/NestedRootTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/NestedRootTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/NestedRootTag.java
@@ -17,9 +17,9 @@
  */
 package org.apache.struts.taglib.nested;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
 
 import org.apache.struts.taglib.TagUtils;
 
@@ -89,7 +89,7 @@ public class NestedRootTag extends BodyT
     }
 
     // do the JSP thing
-    return (EVAL_BODY_TAG);
+    return (EVAL_BODY_BUFFERED);
   }
 
   /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/NestedWriteNestingTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/NestedWriteNestingTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/NestedWriteNestingTag.java
@@ -17,9 +17,9 @@
  */
 package org.apache.struts.taglib.nested;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
 
 import org.apache.struts.taglib.TagUtils;
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/NestedWriteNestingTei.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/NestedWriteNestingTei.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/NestedWriteNestingTei.java
@@ -17,7 +17,7 @@
  */
 package org.apache.struts.taglib.nested;
 
-import javax.servlet.jsp.tagext.*;
+import jakarta.servlet.jsp.tagext.*;
 
 /**
  * NestedWriteNestingTei
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/bean/NestedDefineTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/bean/NestedDefineTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/bean/NestedDefineTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.bean;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.bean.DefineTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/bean/NestedDefineTei.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/bean/NestedDefineTei.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/bean/NestedDefineTei.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.bean;
 
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.VariableInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.VariableInfo;
 
 import org.apache.struts.taglib.logic.IterateTei;
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/bean/NestedMessageTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/bean/NestedMessageTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/bean/NestedMessageTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.bean;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.bean.MessageTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/bean/NestedSizeTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/bean/NestedSizeTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/bean/NestedSizeTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.bean;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.bean.SizeTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/bean/NestedWriteTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/bean/NestedWriteTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/bean/NestedWriteTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.bean;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.bean.WriteTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedCheckboxTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/html/NestedCheckboxTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedCheckboxTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.html;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.html.CheckboxTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedErrorsTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/html/NestedErrorsTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedErrorsTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.html;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.html.ErrorsTag;
 import org.apache.struts.taglib.nested.NestedPropertySupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedFileTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/html/NestedFileTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedFileTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.html;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.html.FileTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedFormTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/html/NestedFormTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedFormTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.html;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.html.FormTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedHiddenTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/html/NestedHiddenTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedHiddenTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.html;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.html.HiddenTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedImageTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/html/NestedImageTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedImageTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.html;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.html.ImageTag;
 import org.apache.struts.taglib.nested.NestedPropertyHelper;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedImgTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/html/NestedImgTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedImgTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.html;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.html.ImgTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedLinkTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/html/NestedLinkTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedLinkTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.html;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.html.LinkTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedMessagesTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/html/NestedMessagesTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedMessagesTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.html;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.html.MessagesTag;
 import org.apache.struts.taglib.nested.NestedPropertySupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedMultiboxTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/html/NestedMultiboxTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedMultiboxTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.html;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.html.MultiboxTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedOptionsCollectionTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/html/NestedOptionsCollectionTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedOptionsCollectionTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.html;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.html.OptionsCollectionTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedOptionsTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/html/NestedOptionsTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedOptionsTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.html;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.html.Constants;
 import org.apache.struts.taglib.html.OptionsTag;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedPasswordTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/html/NestedPasswordTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedPasswordTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.html;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.html.PasswordTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedRadioTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/html/NestedRadioTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedRadioTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.html;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.html.RadioTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedSelectTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/html/NestedSelectTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedSelectTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.html;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.html.SelectTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedSubmitTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/html/NestedSubmitTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedSubmitTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.html;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.html.SubmitTag;
 import org.apache.struts.taglib.nested.NestedPropertyHelper;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedTextTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/html/NestedTextTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedTextTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.html;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.html.TextTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedTextareaTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/html/NestedTextareaTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/html/NestedTextareaTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.html;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.html.TextareaTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedEmptyTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/logic/NestedEmptyTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedEmptyTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.logic.EmptyTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedEqualTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/logic/NestedEqualTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedEqualTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.logic.EqualTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedGreaterEqualTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/logic/NestedGreaterEqualTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedGreaterEqualTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.logic.GreaterEqualTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedGreaterThanTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/logic/NestedGreaterThanTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedGreaterThanTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.logic.GreaterThanTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedIterateTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/logic/NestedIterateTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedIterateTag.java
@@ -18,8 +18,8 @@
 package org.apache.struts.taglib.nested.logic;
 
 import java.util.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.logic.IterateTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedIterateTei.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/logic/NestedIterateTei.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedIterateTei.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.VariableInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.VariableInfo;
 
 import org.apache.struts.taglib.logic.IterateTei;
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedLessEqualTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/logic/NestedLessEqualTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedLessEqualTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.logic.LessEqualTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedLessThanTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/logic/NestedLessThanTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedLessThanTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.logic.LessThanTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedMatchTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/logic/NestedMatchTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedMatchTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.logic.MatchTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedMessagesNotPresentTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/logic/NestedMessagesNotPresentTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedMessagesNotPresentTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.logic.MessagesNotPresentTag;
 import org.apache.struts.taglib.nested.NestedPropertySupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedMessagesPresentTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/logic/NestedMessagesPresentTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedMessagesPresentTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.logic.MessagesPresentTag;
 import org.apache.struts.taglib.nested.NestedPropertySupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedNotEmptyTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/logic/NestedNotEmptyTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedNotEmptyTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.logic.NotEmptyTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedNotEqualTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/logic/NestedNotEqualTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedNotEqualTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.logic.NotEqualTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedNotMatchTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/logic/NestedNotMatchTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedNotMatchTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.logic.NotMatchTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedNotPresentTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/logic/NestedNotPresentTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedNotPresentTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.logic.NotPresentTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedPresentTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/nested/logic/NestedPresentTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/nested/logic/NestedPresentTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.nested.logic;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.logic.PresentTag;
 import org.apache.struts.taglib.nested.NestedNameSupport;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/AddTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/tiles/AddTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/AddTag.java
@@ -19,7 +19,7 @@
 
 package org.apache.struts.taglib.tiles;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
   /**
    * Add an element to the surrounding list tag.
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/AddTagParent.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/tiles/AddTagParent.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/AddTagParent.java
@@ -19,7 +19,7 @@
 
 package org.apache.struts.taglib.tiles;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 /**
  * Tag classes implementing this interface can contain nested <code>PutTag</code>s.
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/AttributeToScopeTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/tiles/AttributeToScopeTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/AttributeToScopeTag.java
@@ -18,9 +18,9 @@
 
 package  org.apache.struts.taglib.tiles;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.TagSupport;
 
 import org.apache.struts.taglib.tiles.util.TagUtils;
 import org.apache.struts.tiles.ComponentContext;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/DefinitionTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/tiles/DefinitionTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/DefinitionTag.java
@@ -18,7 +18,7 @@
 
 package org.apache.struts.taglib.tiles;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.apache.struts.taglib.tiles.util.TagUtils;
 import org.apache.struts.tiles.AttributeDefinition;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/DefinitionTagSupport.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/tiles/DefinitionTagSupport.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/DefinitionTagSupport.java
@@ -18,7 +18,7 @@
 package org.apache.struts.taglib.tiles;
 
 import java.io.Serializable;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.tagext.TagSupport;
 
 /**
  * Common base class for tags dealing with Tiles definitions.
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/GetAttributeTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/tiles/GetAttributeTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/GetAttributeTag.java
@@ -21,10 +21,10 @@ package org.apache.struts.taglib.tiles;
 
 import java.io.IOException;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.TagSupport;
 
 import org.apache.struts.tiles.ComponentContext;
 
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/ImportAttributeTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/tiles/ImportAttributeTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/ImportAttributeTag.java
@@ -21,9 +21,9 @@ package org.apache.struts.taglib.tiles;
 
 import java.util.Iterator;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.TagSupport;
 
 import org.apache.struts.taglib.tiles.util.TagUtils;
 import org.apache.struts.tiles.ComponentContext;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/InitDefinitionsTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/tiles/InitDefinitionsTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/InitDefinitionsTag.java
@@ -19,8 +19,8 @@
 
 package org.apache.struts.taglib.tiles;
 
-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.struts.tiles.DefinitionsFactory;
 import org.apache.struts.tiles.DefinitionsFactoryConfig;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/InsertTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/tiles/InsertTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/InsertTag.java
@@ -23,11 +23,11 @@ import java.io.PrintWriter;
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/PutListTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/tiles/PutListTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/PutListTag.java
@@ -21,8 +21,8 @@ package org.apache.struts.taglib.tiles;
 import java.util.ArrayList;
 import java.util.List;
 
-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.struts.tiles.AttributeDefinition;
 import org.apache.struts.tiles.UntypedAttribute;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/PutListTagParent.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/tiles/PutListTagParent.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/PutListTagParent.java
@@ -19,7 +19,7 @@
 
 package org.apache.struts.taglib.tiles;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 /**
  * Tag classes implementing this interface can contains nested PutTag.
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/PutTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/tiles/PutTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/PutTag.java
@@ -20,8 +20,8 @@ package org.apache.struts.taglib.tiles;
 
 import java.lang.reflect.InvocationTargetException;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
 
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.struts.taglib.tiles.util.TagUtils;
@@ -432,7 +432,7 @@ public class PutTag extends BodyTagSuppo
 
         // Do we need to evaluate body ?
         if (value == null && beanName == null) {
-            return EVAL_BODY_TAG;
+            return EVAL_BODY_BUFFERED;
         }
 
         // Value is set, don't evaluate body.
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/PutTagParent.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/tiles/PutTagParent.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/PutTagParent.java
@@ -19,7 +19,7 @@
 
 package org.apache.struts.taglib.tiles;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 /**
  * Tag classes implementing this interface can contain nested PutTag.
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/UseAttributeTag.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/tiles/UseAttributeTag.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/UseAttributeTag.java
@@ -19,9 +19,9 @@
 
 package org.apache.struts.taglib.tiles;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.TagSupport;
 
 import org.apache.struts.taglib.tiles.util.TagUtils;
 import org.apache.struts.tiles.ComponentContext;
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/UseAttributeTei.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/tiles/UseAttributeTei.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/UseAttributeTei.java
@@ -20,9 +20,9 @@
 package org.apache.struts.taglib.tiles;
 
 
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.VariableInfo;
 
 
 /**
Index: struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/util/TagUtils.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/taglib/tiles/util/TagUtils.java
+++ struts-1.2.9-src/src/share/org/apache/struts/taglib/tiles/util/TagUtils.java
@@ -20,8 +20,8 @@ package org.apache.struts.taglib.tiles.u
 
 import java.lang.reflect.InvocationTargetException;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
 
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.struts.Globals;
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/ActionController.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/ActionController.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/ActionController.java
@@ -20,10 +20,10 @@ package org.apache.struts.tiles;
 
 import java.io.IOException;
 
-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 org.apache.struts.action.Action;
 
@@ -72,7 +72,7 @@ public class ActionController implements
 	}
 
 	/**
-	 * @see org.apache.struts.tiles.Controller#execute(org.apache.struts.tiles.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext)
+	 * @see org.apache.struts.tiles.Controller#execute(org.apache.struts.tiles.ComponentContext, jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse, jakarta.servlet.ServletContext)
 	 */
 	public void execute(
 		ComponentContext tileContext,
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/ComponentContext.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/ComponentContext.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/ComponentContext.java
@@ -25,8 +25,8 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.jsp.PageContext;
 
 import org.apache.struts.taglib.tiles.ComponentConstants;
 
@@ -182,7 +182,7 @@ public class ComponentContext implements
      * jspException is present in the request.
      */
     static public ComponentContext getContext(ServletRequest request) {
-       if (request.getAttribute("javax.servlet.jsp.jspException") != null) {
+       if (request.getAttribute("jakarta.servlet.jsp.jspException") != null) {
            return null;
         }        return (ComponentContext) request.getAttribute(
             ComponentConstants.COMPONENT_CONTEXT);
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/ComponentDefinitionsFactory.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/ComponentDefinitionsFactory.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/ComponentDefinitionsFactory.java
@@ -22,8 +22,8 @@ package org.apache.struts.tiles;
 import java.io.Serializable;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
 
 /**
  * Component repository interface.
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/Controller.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/Controller.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/Controller.java
@@ -20,10 +20,10 @@ package org.apache.struts.tiles;
 
 import java.io.IOException;
 
-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;
 
 /**
  * A controller is a piece of code called before rendering a jsp page.
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/ControllerSupport.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/ControllerSupport.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/ControllerSupport.java
@@ -20,10 +20,10 @@ package org.apache.struts.tiles;
 
 import java.io.IOException;
 
-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;
 
 /**
  * Basic implementation of Controller.  Implementations can extend this class
@@ -51,7 +51,7 @@ public class ControllerSupport implement
 	}
 
 	/**
-	 * @see org.apache.struts.tiles.Controller#execute(org.apache.struts.tiles.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext)
+	 * @see org.apache.struts.tiles.Controller#execute(org.apache.struts.tiles.ComponentContext, jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse, jakarta.servlet.ServletContext)
 	 */
 	public void execute(
 		ComponentContext tileContext,
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/DefinitionsFactory.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/DefinitionsFactory.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/DefinitionsFactory.java
@@ -21,8 +21,8 @@ package org.apache.struts.tiles;
 
 import java.io.Serializable;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
 
 /**
  * Tiles Definition factory.
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/DefinitionsUtil.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/DefinitionsUtil.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/DefinitionsUtil.java
@@ -23,9 +23,9 @@ import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/TilesPlugin.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/TilesPlugin.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/TilesPlugin.java
@@ -20,9 +20,9 @@ package org.apache.struts.tiles;
 
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.UnavailableException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.UnavailableException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/TilesRequestProcessor.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/TilesRequestProcessor.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/TilesRequestProcessor.java
@@ -20,9 +20,9 @@ package org.apache.struts.tiles;
 
 import java.io.IOException;
 
-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.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/TilesUtil.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/TilesUtil.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/TilesUtil.java
@@ -20,12 +20,12 @@ package org.apache.struts.tiles;
 
 import java.io.IOException;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.PageContext;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/TilesUtilImpl.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/TilesUtilImpl.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/TilesUtilImpl.java
@@ -21,12 +21,12 @@ package org.apache.struts.tiles;
 import java.io.IOException;
 import java.io.Serializable;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.PageContext;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/TilesUtilStrutsImpl.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/TilesUtilStrutsImpl.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/TilesUtilStrutsImpl.java
@@ -18,7 +18,7 @@
 
 package org.apache.struts.tiles;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.apache.struts.config.ModuleConfig;
 
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/TilesUtilStrutsModulesImpl.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/TilesUtilStrutsModulesImpl.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/TilesUtilStrutsModulesImpl.java
@@ -20,11 +20,11 @@ package org.apache.struts.tiles;
 
 import java.io.IOException;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.struts.Globals;
 import org.apache.struts.config.ModuleConfig;
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/UrlController.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/UrlController.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/UrlController.java
@@ -20,11 +20,11 @@ package org.apache.struts.tiles;
 
 import java.io.IOException;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Tiles controller including a local URL.
@@ -71,7 +71,7 @@ public class UrlController implements Co
 	}
 
 	/**
-	 * @see org.apache.struts.tiles.Controller#execute(org.apache.struts.tiles.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext)
+	 * @see org.apache.struts.tiles.Controller#execute(org.apache.struts.tiles.ComponentContext, jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse, jakarta.servlet.ServletContext)
 	 */
 	public void execute(
 		ComponentContext tileContext,
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/actions/DefinitionDispatcherAction.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/actions/DefinitionDispatcherAction.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/actions/DefinitionDispatcherAction.java
@@ -21,8 +21,8 @@ package org.apache.struts.tiles.actions;
 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.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/actions/ReloadDefinitionsAction.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/actions/ReloadDefinitionsAction.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/actions/ReloadDefinitionsAction.java
@@ -21,9 +21,9 @@ package org.apache.struts.tiles.actions;
 
 import java.io.PrintWriter;
 
-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.struts.action.Action;
 import org.apache.struts.action.ActionForm;
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/actions/TilesAction.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/actions/TilesAction.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/actions/TilesAction.java
@@ -18,9 +18,9 @@
 
 package org.apache.struts.tiles.actions;
 
-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.struts.action.Action;
 import org.apache.struts.action.ActionForm;
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/actions/ViewDefinitionsAction.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/actions/ViewDefinitionsAction.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/actions/ViewDefinitionsAction.java
@@ -21,9 +21,9 @@ package org.apache.struts.tiles.actions;
 
 import java.io.PrintWriter;
 
-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.struts.action.Action;
 import org.apache.struts.action.ActionForm;
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/definition/ComponentDefinitionsFactoryWrapper.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/definition/ComponentDefinitionsFactoryWrapper.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/definition/ComponentDefinitionsFactoryWrapper.java
@@ -21,8 +21,8 @@ package org.apache.struts.tiles.definiti
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
 
 import org.apache.struts.tiles.ComponentDefinition;
 import org.apache.struts.tiles.ComponentDefinitionsFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/definition/ReloadableDefinitionsFactory.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/definition/ReloadableDefinitionsFactory.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/definition/ReloadableDefinitionsFactory.java
@@ -22,10 +22,10 @@ import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.struts.tiles.ComponentDefinition;
 import org.apache.struts.tiles.ComponentDefinitionsFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/xmlDefinition/DefinitionsFactory.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/xmlDefinition/DefinitionsFactory.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/xmlDefinition/DefinitionsFactory.java
@@ -24,8 +24,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
 
 import org.apache.struts.tiles.ComponentDefinition;
 import org.apache.struts.tiles.DefinitionsFactoryException;
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/xmlDefinition/FactorySet.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/xmlDefinition/FactorySet.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/xmlDefinition/FactorySet.java
@@ -23,8 +23,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
 
 import org.apache.struts.tiles.ComponentDefinition;
 import org.apache.struts.tiles.ComponentDefinitionsFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/tiles/xmlDefinition/I18nFactorySet.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/tiles/xmlDefinition/I18nFactorySet.java
+++ struts-1.2.9-src/src/share/org/apache/struts/tiles/xmlDefinition/I18nFactorySet.java
@@ -29,10 +29,10 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/upload/CommonsMultipartRequestHandler.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/upload/CommonsMultipartRequestHandler.java
+++ struts-1.2.9-src/src/share/org/apache/struts/upload/CommonsMultipartRequestHandler.java
@@ -29,12 +29,12 @@ import java.nio.file.Paths;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.fileupload2.core.FileItem;
 import org.apache.commons.fileupload2.core.DiskFileItemFactory;
-import org.apache.commons.fileupload2.javax.JavaxServletFileUpload;
+import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts.action.ActionServlet;
@@ -176,8 +176,8 @@ public class CommonsMultipartRequestHand
                 .setPath(Paths.get(getRepositoryPath(ac)))
                 .get();
 
-        // Create the JavaxServletFileUpload instance.
-        JavaxServletFileUpload upload = new JavaxServletFileUpload(factory);
+        // Create the JakartaServletFileUpload instance.
+        JakartaServletFileUpload upload = new JakartaServletFileUpload(factory);
     
         // The following line is to support an "EncodingFilter"
         upload.setHeaderCharset(java.nio.charset.Charset.forName(request.getCharacterEncoding()));
@@ -219,7 +219,6 @@ public class CommonsMultipartRequestHand
         return this.elementsText;
     }
 
-
     /**
      * Returns a hash table containing the file (that is, non-text) request
      * parameters.
@@ -346,7 +345,7 @@ public class CommonsMultipartRequestHand
      *     servlet init param, or the <code>tempDir</code> attribute of the
      *     &lt;controller&gt; element in the Struts config file.</li>
      * <li>The container-specified temp dir, obtained from the
-     *     <code>javax.servlet.context.tempdir</code> servlet context
+     *     <code>jakarta.servlet.context.tempdir</code> servlet context
      *     attribute.</li>
      * <li>The temp dir specified by the <code>java.io.tmpdir</code> system
      *     property.</li>
@@ -367,7 +366,7 @@ public class CommonsMultipartRequestHand
             if (servlet != null) {
                 ServletContext context = servlet.getServletContext();
                 File tempDirFile = (File) context.getAttribute(
-                        "javax.servlet.context.tempdir");
+                        "jakarta.servlet.context.tempdir");
                 tempDir = tempDirFile.getAbsolutePath();
             }
 
Index: struts-1.2.9-src/src/share/org/apache/struts/upload/DiskMultipartRequestHandler.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/upload/DiskMultipartRequestHandler.java
+++ struts-1.2.9-src/src/share/org/apache/struts/upload/DiskMultipartRequestHandler.java
@@ -23,9 +23,9 @@ import java.io.IOException;
 import java.util.Enumeration;
 import java.util.Hashtable;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -244,9 +244,9 @@ public class DiskMultipartRequestHandler
 
             try {
                 tempDir =
-                        (String) context.getAttribute("javax.servlet.context.tempdir");
+                        (String) context.getAttribute("jakarta.servlet.context.tempdir");
             } catch(ClassCastException cce) {
-                tempDir = ((File) context.getAttribute("javax.servlet.context.tempdir")).getAbsolutePath();
+                tempDir = ((File) context.getAttribute("jakarta.servlet.context.tempdir")).getAbsolutePath();
             }
         }
 
Index: struts-1.2.9-src/src/share/org/apache/struts/upload/MultipartIterator.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/upload/MultipartIterator.java
+++ struts-1.2.9-src/src/share/org/apache/struts/upload/MultipartIterator.java
@@ -25,7 +25,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * The MultipartIterator class is responsible for reading the
@@ -315,7 +315,7 @@ public class MultipartIterator
     /**
      * Set the maximum amount of bytes read from a line at one time
      *
-     * @see javax.servlet.ServletInputStream#readLine(byte[], int, int)
+     * @see jakarta.servlet.ServletInputStream#readLine(byte[], int, int)
      */
     public void setBufferSize(int bufferSize) {
         this.bufferSize = bufferSize;
@@ -324,7 +324,7 @@ public class MultipartIterator
     /**
      * Get the maximum amount of bytes read from a line at one time
      *
-     * @see javax.servlet.ServletInputStream#readLine(byte[], int, int)
+     * @see jakarta.servlet.ServletInputStream#readLine(byte[], int, int)
      */
     public int getBufferSize() {
         return bufferSize;
Index: struts-1.2.9-src/src/share/org/apache/struts/upload/MultipartRequestHandler.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/upload/MultipartRequestHandler.java
+++ struts-1.2.9-src/src/share/org/apache/struts/upload/MultipartRequestHandler.java
@@ -19,8 +19,8 @@
 package org.apache.struts.upload;
 
 import java.util.Hashtable;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.struts.action.ActionServlet;
 import org.apache.struts.action.ActionMapping;
 
Index: struts-1.2.9-src/src/share/org/apache/struts/upload/MultipartValueStream.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/upload/MultipartValueStream.java
+++ struts-1.2.9-src/src/share/org/apache/struts/upload/MultipartValueStream.java
@@ -21,7 +21,7 @@ package org.apache.struts.upload;
 import java.io.IOException;
 import java.io.InputStream;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 /**
  * This class implements an inputStream that reads another stream until 
Index: struts-1.2.9-src/src/share/org/apache/struts/util/ModuleUtils.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/util/ModuleUtils.java
+++ struts-1.2.9-src/src/share/org/apache/struts/util/ModuleUtils.java
@@ -18,8 +18,8 @@
 
 package org.apache.struts.util;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/util/RequestUtils.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/util/RequestUtils.java
+++ struts-1.2.9-src/src/share/org/apache/struts/util/RequestUtils.java
@@ -28,12 +28,12 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.DynaBean;
Index: struts-1.2.9-src/src/share/org/apache/struts/util/ResponseUtils.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/util/ResponseUtils.java
+++ struts-1.2.9-src/src/share/org/apache/struts/util/ResponseUtils.java
@@ -18,8 +18,8 @@
 
 package org.apache.struts.util;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
 
 import org.apache.struts.taglib.TagUtils;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/util/ServletContextWriter.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/util/ServletContextWriter.java
+++ struts-1.2.9-src/src/share/org/apache/struts/util/ServletContextWriter.java
@@ -20,11 +20,11 @@ package org.apache.struts.util;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 /**
  * A PrintWriter implementation that uses the logging facilities of a
- * <code>javax.servlet.ServletContext</code> to output its results.  Output
+ * <code>jakarta.servlet.ServletContext</code> to output its results.  Output
  * will be buffered until a newline character is output, <code>flush()</code>
  * is called, or until one of the <code>println()</code> methods is called.
  * Along the way, carriage return characters are skipped.
Index: struts-1.2.9-src/src/share/org/apache/struts/util/TokenProcessor.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/util/TokenProcessor.java
+++ struts-1.2.9-src/src/share/org/apache/struts/util/TokenProcessor.java
@@ -21,8 +21,8 @@ package org.apache.struts.util;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 
 import org.apache.struts.Globals;
 import org.apache.struts.taglib.html.Constants;
Index: struts-1.2.9-src/src/share/org/apache/struts/util/package.html
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/util/package.html
+++ struts-1.2.9-src/src/share/org/apache/struts/util/package.html
@@ -57,7 +57,7 @@ are included:</p>
     is a general purpose utility methods related to generating a servlet 
     response. The <code>ServletContextWriter</code> is a PrintWriter 
     implementation that uses the logging facilities of a 
-    <code>javax.servlet.ServletContext</code> to output its results.
+    <code>jakarta.servlet.ServletContext</code> to output its results.
 </p>
 
 <hr>
Index: struts-1.2.9-src/src/share/org/apache/struts/validator/BeanValidatorForm.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/validator/BeanValidatorForm.java
+++ struts-1.2.9-src/src/share/org/apache/struts/validator/BeanValidatorForm.java
@@ -19,7 +19,7 @@ import java.util.List;
 import java.util.Map;
 import java.lang.reflect.Array;
 import java.io.Serializable;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.struts.action.ActionMapping;
 import org.apache.commons.beanutils.DynaClass;
 import org.apache.commons.beanutils.DynaBean;
Index: struts-1.2.9-src/src/share/org/apache/struts/validator/DynaValidatorActionForm.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/validator/DynaValidatorActionForm.java
+++ struts-1.2.9-src/src/share/org/apache/struts/validator/DynaValidatorActionForm.java
@@ -19,7 +19,7 @@
 package org.apache.struts.validator;
 
 import java.io.Serializable;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.commons.beanutils.DynaBean;
 import org.apache.struts.action.ActionMapping;
Index: struts-1.2.9-src/src/share/org/apache/struts/validator/DynaValidatorForm.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/validator/DynaValidatorForm.java
+++ struts-1.2.9-src/src/share/org/apache/struts/validator/DynaValidatorForm.java
@@ -21,8 +21,8 @@ package org.apache.struts.validator;
 import java.io.Serializable;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.commons.beanutils.DynaBean;
 import org.apache.commons.logging.Log;
Index: struts-1.2.9-src/src/share/org/apache/struts/validator/FieldChecks.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/validator/FieldChecks.java
+++ struts-1.2.9-src/src/share/org/apache/struts/validator/FieldChecks.java
@@ -23,8 +23,8 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/validator/Resources.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/validator/Resources.java
+++ struts-1.2.9-src/src/share/org/apache/struts/validator/Resources.java
@@ -20,8 +20,8 @@ package org.apache.struts.validator;
 
 import java.util.Locale;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.commons.validator.Arg;
 import org.apache.commons.validator.Field;
@@ -50,7 +50,7 @@ public class Resources {
     /**
      * Resources key the <code>ServletContext</code> is stored under.
      */
-    private static String SERVLET_CONTEXT_PARAM = "javax.servlet.ServletContext";
+    private static String SERVLET_CONTEXT_PARAM = "jakarta.servlet.ServletContext";
 
     /**
      * Resources key the <code>ServletContext</code> is stored under.
@@ -62,7 +62,7 @@ public class Resources {
      * Resources key the <code>HttpServletRequest</code> is stored under.
      */
     private static String HTTP_SERVLET_REQUEST_PARAM =
-        "javax.servlet.http.HttpServletRequest";
+        "jakarta.servlet.http.HttpServletRequest";
 
     /**
      * Resources key the <code>HttpServletRequest</code> is stored under.
Index: struts-1.2.9-src/src/share/org/apache/struts/validator/ValidatorActionForm.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/validator/ValidatorActionForm.java
+++ struts-1.2.9-src/src/share/org/apache/struts/validator/ValidatorActionForm.java
@@ -19,7 +19,7 @@
 package org.apache.struts.validator;
 
 import java.io.Serializable;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.struts.action.ActionMapping;
 
Index: struts-1.2.9-src/src/share/org/apache/struts/validator/ValidatorForm.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/validator/ValidatorForm.java
+++ struts-1.2.9-src/src/share/org/apache/struts/validator/ValidatorForm.java
@@ -21,8 +21,8 @@ package org.apache.struts.validator;
 import java.io.Serializable;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/validator/ValidatorPlugIn.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/validator/ValidatorPlugIn.java
+++ struts-1.2.9-src/src/share/org/apache/struts/validator/ValidatorPlugIn.java
@@ -27,8 +27,8 @@ import java.util.Iterator;
 import java.io.BufferedInputStream;
 import java.io.InputStream;
 import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.UnavailableException;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.UnavailableException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/share/org/apache/struts/validator/validwhen/ValidWhen.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/validator/validwhen/ValidWhen.java
+++ struts-1.2.9-src/src/share/org/apache/struts/validator/validwhen/ValidWhen.java
@@ -20,7 +20,7 @@ package org.apache.struts.validator.vali
 
 import java.io.StringReader;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.commons.validator.Field;
 import org.apache.commons.validator.Validator;
Index: struts-1.2.9-src/src/test/org/apache/struts/action/TestActionServlet.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/action/TestActionServlet.java
+++ struts-1.2.9-src/src/test/org/apache/struts/action/TestActionServlet.java
@@ -17,7 +17,7 @@
  */
 package org.apache.struts.action;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/mock/MockActionServlet.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/mock/MockActionServlet.java
+++ struts-1.2.9-src/src/test/org/apache/struts/mock/MockActionServlet.java
@@ -20,8 +20,8 @@
 package org.apache.struts.mock;
 
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletConfig;
 
 
 import org.apache.struts.action.ActionServlet;
Index: struts-1.2.9-src/src/test/org/apache/struts/mock/MockHttpServletRequest.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/mock/MockHttpServletRequest.java
+++ struts-1.2.9-src/src/test/org/apache/struts/mock/MockHttpServletRequest.java
@@ -27,11 +27,11 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 
 
 
Index: struts-1.2.9-src/src/test/org/apache/struts/mock/MockHttpServletResponse.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/mock/MockHttpServletResponse.java
+++ struts-1.2.9-src/src/test/org/apache/struts/mock/MockHttpServletResponse.java
@@ -23,9 +23,9 @@ package org.apache.struts.mock;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Locale;
-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;
 
 
 
Index: struts-1.2.9-src/src/test/org/apache/struts/mock/MockHttpSession.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/mock/MockHttpSession.java
+++ struts-1.2.9-src/src/test/org/apache/struts/mock/MockHttpSession.java
@@ -22,9 +22,9 @@ package org.apache.struts.mock;
 
 import java.util.Enumeration;
 import java.util.HashMap;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionContext;
 
 
 
Index: struts-1.2.9-src/src/test/org/apache/struts/mock/MockMultipartRequestHandler.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/mock/MockMultipartRequestHandler.java
+++ struts-1.2.9-src/src/test/org/apache/struts/mock/MockMultipartRequestHandler.java
@@ -20,8 +20,8 @@ package org.apache.struts.mock;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.struts.action.ActionServlet;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.upload.MultipartRequestHandler;
Index: struts-1.2.9-src/src/test/org/apache/struts/mock/MockPageContext.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/mock/MockPageContext.java
+++ struts-1.2.9-src/src/test/org/apache/struts/mock/MockPageContext.java
@@ -24,16 +24,16 @@ import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyContent;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyContent;
 
 
 /**
Index: struts-1.2.9-src/src/test/org/apache/struts/mock/MockServletConfig.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/mock/MockServletConfig.java
+++ struts-1.2.9-src/src/test/org/apache/struts/mock/MockServletConfig.java
@@ -23,8 +23,8 @@ package org.apache.struts.mock;
 import java.util.Enumeration;
 import java.util.HashMap;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
 
 
 /**
Index: struts-1.2.9-src/src/test/org/apache/struts/mock/MockServletContext.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/mock/MockServletContext.java
+++ struts-1.2.9-src/src/test/org/apache/struts/mock/MockServletContext.java
@@ -25,9 +25,9 @@ import java.net.URL;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Set;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/SimpleFormBeanForTesting.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/SimpleFormBeanForTesting.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/SimpleFormBeanForTesting.java
@@ -20,7 +20,7 @@
 package org.apache.struts.taglib;
 
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.validator.ValidatorForm;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestDefineTag.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/bean/TestDefineTag.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestDefineTag.java
@@ -17,7 +17,7 @@
  */
 package org.apache.struts.taglib.bean;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestMessageTag.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/bean/TestMessageTag.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestMessageTag.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.bean;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestMessageTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/bean/TestMessageTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestMessageTag1.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.bean;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestMessageTag1_fr.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/bean/TestMessageTag1_fr.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestMessageTag1_fr.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.bean;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestMessageTag2.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/bean/TestMessageTag2.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestMessageTag2.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.bean;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestMessageTag2_fr.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/bean/TestMessageTag2_fr.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestMessageTag2_fr.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.bean;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestMessageTag3.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/bean/TestMessageTag3.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestMessageTag3.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.bean;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestMessageTag3_fr.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/bean/TestMessageTag3_fr.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestMessageTag3_fr.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.bean;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestMessageTag4.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/bean/TestMessageTag4.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestMessageTag4.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.bean;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestMessageTag4_fr.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/bean/TestMessageTag4_fr.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestMessageTag4_fr.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.bean;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestMessageTag_fr.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/bean/TestMessageTag_fr.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestMessageTag_fr.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.bean;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestPageTag.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/bean/TestPageTag.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestPageTag.java
@@ -17,7 +17,7 @@
  */
 package org.apache.struts.taglib.bean;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestParameterTag.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/bean/TestParameterTag.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestParameterTag.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.bean;
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestResourceTag.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/bean/TestResourceTag.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestResourceTag.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.bean;
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestSizeTag.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/bean/TestSizeTag.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestSizeTag.java
@@ -23,8 +23,8 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.ServletException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestStrutsTag.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/bean/TestStrutsTag.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestStrutsTag.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.bean;
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestWriteTag.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/bean/TestWriteTag.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/bean/TestWriteTag.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.bean;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestButtonTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestButtonTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestButtonTag1.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestButtonTag2.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestButtonTag2.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestButtonTag2.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestCancelTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestCancelTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestCancelTag1.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestCancelTag2.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestCancelTag2.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestCancelTag2.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestCheckboxTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestCheckboxTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestCheckboxTag1.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestCheckboxTag2.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestCheckboxTag2.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestCheckboxTag2.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestCheckboxTag3.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestCheckboxTag3.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestCheckboxTag3.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestCheckboxTag4.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestCheckboxTag4.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestCheckboxTag4.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestErrorsTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestErrorsTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestErrorsTag1.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestErrorsTag2.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestErrorsTag2.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestErrorsTag2.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestErrorsTag3.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestErrorsTag3.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestErrorsTag3.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestErrorsTag4.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestErrorsTag4.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestErrorsTag4.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestFileTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestFileTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestFileTag1.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestFileTag2.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestFileTag2.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestFileTag2.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestFormTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestFormTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestFormTag1.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestFrameTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestFrameTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestFrameTag1.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
 import java.util.Locale;
 
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestFrameTag2.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestFrameTag2.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestFrameTag2.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestFrameTag3.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestFrameTag3.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestFrameTag3.java
@@ -20,7 +20,7 @@ package org.apache.struts.taglib.html;
 import java.util.HashMap;
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestFrameTag4.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestFrameTag4.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestFrameTag4.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestFrameTag5.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestFrameTag5.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestFrameTag5.java
@@ -20,7 +20,7 @@ package org.apache.struts.taglib.html;
 import java.util.HashMap;
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestFrameTag6.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestFrameTag6.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestFrameTag6.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestFrameTag7.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestFrameTag7.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestFrameTag7.java
@@ -20,7 +20,7 @@ package org.apache.struts.taglib.html;
 import java.util.HashMap;
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestFrameTag8.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestFrameTag8.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestFrameTag8.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestHiddenTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestHiddenTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestHiddenTag1.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestHiddenTag2.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestHiddenTag2.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestHiddenTag2.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestHtmlTag.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestHtmlTag.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestHtmlTag.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImageTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestImageTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImageTag1.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImageTag2.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestImageTag2.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImageTag2.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImageTag3.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestImageTag3.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImageTag3.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImageTag4.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestImageTag4.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImageTag4.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImageTag5.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestImageTag5.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImageTag5.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImageTag6.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestImageTag6.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImageTag6.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImageTag7.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestImageTag7.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImageTag7.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImageTag8.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestImageTag8.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImageTag8.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestImgTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag1.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag1a.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestImgTag1a.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag1a.java
@@ -20,7 +20,7 @@ package org.apache.struts.taglib.html;
 import java.util.HashMap;
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag2.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestImgTag2.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag2.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag3.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestImgTag3.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag3.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag3a.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestImgTag3a.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag3a.java
@@ -20,7 +20,7 @@ package org.apache.struts.taglib.html;
 import java.util.HashMap;
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag4.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestImgTag4.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag4.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag5.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestImgTag5.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag5.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag5a.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestImgTag5a.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag5a.java
@@ -20,7 +20,7 @@ package org.apache.struts.taglib.html;
 import java.util.HashMap;
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag6.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestImgTag6.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag6.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag7.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestImgTag7.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag7.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag7a.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestImgTag7a.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag7a.java
@@ -20,7 +20,7 @@ package org.apache.struts.taglib.html;
 import java.util.HashMap;
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag8.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestImgTag8.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestImgTag8.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestLinkTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestLinkTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestLinkTag1.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestLinkTag2.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestLinkTag2.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestLinkTag2.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestLinkTag3.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestLinkTag3.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestLinkTag3.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestLinkTag4.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestLinkTag4.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestLinkTag4.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestLinkTag5.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestLinkTag5.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestLinkTag5.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestLinkTag6.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestLinkTag6.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestLinkTag6.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestLinkTag7.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestLinkTag7.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestLinkTag7.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestLinkTag8.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestLinkTag8.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestLinkTag8.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMessagesTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestMessagesTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMessagesTag1.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMessagesTag2.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestMessagesTag2.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMessagesTag2.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMessagesTag3.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestMessagesTag3.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMessagesTag3.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMessagesTag4.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestMessagesTag4.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMessagesTag4.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMessagesTag5.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestMessagesTag5.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMessagesTag5.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMessagesTag6.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestMessagesTag6.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMessagesTag6.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMessagesTag7.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestMessagesTag7.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMessagesTag7.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMessagesTag8.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestMessagesTag8.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMessagesTag8.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMultiboxTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestMultiboxTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMultiboxTag1.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMultiboxTag2.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestMultiboxTag2.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMultiboxTag2.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMultiboxTag3.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestMultiboxTag3.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMultiboxTag3.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMultiboxTag4.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestMultiboxTag4.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMultiboxTag4.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMultiboxTag5.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestMultiboxTag5.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestMultiboxTag5.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestOptionTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestOptionTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestOptionTag1.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestOptionsTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestOptionsTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestOptionsTag1.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestPasswordTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestPasswordTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestPasswordTag1.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestPasswordTag2.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestPasswordTag2.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestPasswordTag2.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestRadioTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestRadioTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestRadioTag1.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestRadioTag2.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestRadioTag2.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestRadioTag2.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestResetTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestResetTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestResetTag1.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestResetTag2.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestResetTag2.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestResetTag2.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestSelectTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestSelectTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestSelectTag1.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestSelectTag2.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestSelectTag2.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestSelectTag2.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestSubmitTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestSubmitTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestSubmitTag1.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestSubmitTag2.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestSubmitTag2.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestSubmitTag2.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestTextTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestTextTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestTextTag1.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestTextTag2.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestTextTag2.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestTextTag2.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestTextareaTag1.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestTextareaTag1.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestTextareaTag1.java
@@ -19,7 +19,7 @@ package org.apache.struts.taglib.html;
 
 import java.util.Locale;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestTextareaTag2.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/html/TestTextareaTag2.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/html/TestTextareaTag2.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/logic/TestEmptyTag.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/logic/TestEmptyTag.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/logic/TestEmptyTag.java
@@ -20,9 +20,9 @@ package org.apache.struts.taglib.logic;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import javax.servlet.ServletException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/logic/TestEqualTag.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/logic/TestEqualTag.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/logic/TestEqualTag.java
@@ -17,9 +17,9 @@
  */
 package org.apache.struts.taglib.logic;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.jsp.JspException;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/logic/TestGreaterEqualTag.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/logic/TestGreaterEqualTag.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/logic/TestGreaterEqualTag.java
@@ -17,9 +17,9 @@
  */
 package org.apache.struts.taglib.logic;
 
-import javax.servlet.ServletException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.apache.cactus.JspTestCase;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/logic/TestGreaterThanTag.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/logic/TestGreaterThanTag.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/logic/TestGreaterThanTag.java
@@ -17,9 +17,9 @@
  */
 package org.apache.struts.taglib.logic;
 
-import javax.servlet.ServletException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.apache.cactus.JspTestCase;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/logic/TestIterateTag.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/logic/TestIterateTag.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/logic/TestIterateTag.java
@@ -22,9 +22,9 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.StringTokenizer;
 
-import javax.servlet.ServletException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -110,7 +110,7 @@ public class TestIterateTag extends Tagl
 			out.print((String)pageContext.getAttribute("theId"));
 		    iteration++;
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 		assertEquals(iterations, iteration);
 	}
@@ -157,7 +157,7 @@ public class TestIterateTag extends Tagl
 			out.print((String)pageContext.getAttribute("theId"));
 		    iteration++;
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 		assertEquals(iterations, iteration);
 	}
@@ -204,7 +204,7 @@ public class TestIterateTag extends Tagl
 			out.print((String)pageContext.getAttribute("theId"));
 		    iteration++;
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 		assertEquals(iterations, iteration);
 	}
@@ -272,7 +272,7 @@ public class TestIterateTag extends Tagl
 			out.print((String)pageContext.getAttribute("theId"));
 		    iteration++;
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 		assertEquals(iterations, iteration);
 	}
@@ -330,7 +330,7 @@ public class TestIterateTag extends Tagl
 			out.print((String)pageContext.getAttribute("theId"));
 		    iteration++;
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 		assertEquals(iterations, iteration);
 	}
@@ -388,7 +388,7 @@ public class TestIterateTag extends Tagl
 			out.print((String)pageContext.getAttribute("theId"));
 		    iteration++;
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 		assertEquals(iterations, iteration);
 	}
@@ -442,7 +442,7 @@ public class TestIterateTag extends Tagl
 		{
 			out.print((String)pageContext.getAttribute("theId"));
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 
 	}
@@ -486,7 +486,7 @@ public class TestIterateTag extends Tagl
 		{
 			out.print((String)pageContext.getAttribute("theId"));
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 
 	}
@@ -530,7 +530,7 @@ public class TestIterateTag extends Tagl
 		{
 			out.print((String)pageContext.getAttribute("theId"));
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 
 	}
@@ -589,7 +589,7 @@ public class TestIterateTag extends Tagl
 		{
 			out.print((String)pageContext.getAttribute("theId"));
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 
 	}
@@ -637,7 +637,7 @@ public class TestIterateTag extends Tagl
 		{
 			out.print((String)pageContext.getAttribute("theId"));
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 
 	}
@@ -685,7 +685,7 @@ public class TestIterateTag extends Tagl
 		{
 			out.print((String)pageContext.getAttribute("theId"));
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 
 	}
@@ -748,7 +748,7 @@ public class TestIterateTag extends Tagl
 			out.print(pageContext.getAttribute("theId"));
 		    iteration++;
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 		assertEquals(iterations, iteration);
 	}
@@ -795,7 +795,7 @@ public class TestIterateTag extends Tagl
 			out.print(pageContext.getAttribute("theId"));
 		    iteration++;
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 		assertEquals(iterations, iteration);
 	}
@@ -842,7 +842,7 @@ public class TestIterateTag extends Tagl
 			out.print(pageContext.getAttribute("theId"));
 		    iteration++;
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 		assertEquals(iterations, iteration);
 	}
@@ -906,7 +906,7 @@ public class TestIterateTag extends Tagl
 			out.print(pageContext.getAttribute("theId"));
 		    iteration++;
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 		assertEquals(iterations, iteration);
 	}
@@ -957,7 +957,7 @@ public class TestIterateTag extends Tagl
 			out.print(pageContext.getAttribute("theId"));
 		    iteration++;
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 		assertEquals(iterations, iteration);
 	}
@@ -1008,7 +1008,7 @@ public class TestIterateTag extends Tagl
 			out.print(pageContext.getAttribute("theId"));
 		    iteration++;
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 		assertEquals(iterations, iteration);
 	}
@@ -1069,7 +1069,7 @@ public class TestIterateTag extends Tagl
 			out.print(pageContext.getAttribute("theId"));
 		    iteration++;
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 		assertEquals(iterations, iteration);
 	}
@@ -1121,7 +1121,7 @@ public class TestIterateTag extends Tagl
 			out.print(pageContext.getAttribute("theId"));
 		    iteration++;
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 		assertEquals(iterations, iteration);
 	}
@@ -1173,7 +1173,7 @@ public class TestIterateTag extends Tagl
 			out.print(pageContext.getAttribute("theId"));
 		    iteration++;
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 		assertEquals(iterations, iteration);
 	}
@@ -1239,7 +1239,7 @@ public class TestIterateTag extends Tagl
 			out.print(pageContext.getAttribute("theId"));
 		    iteration++;
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 		assertEquals(iterations, iteration);
 	}
@@ -1295,7 +1295,7 @@ public class TestIterateTag extends Tagl
 			out.print(pageContext.getAttribute("theId"));
 		    iteration++;
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 		assertEquals(iterations, iteration);
 	}
@@ -1351,7 +1351,7 @@ public class TestIterateTag extends Tagl
 			out.print(pageContext.getAttribute("theId"));
 		    iteration++;
 		
-		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
+		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_BUFFERED);
 		tag.doEndTag();
 		assertEquals(iterations, iteration);
 	}
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/logic/TestLessEqualTag.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/logic/TestLessEqualTag.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/logic/TestLessEqualTag.java
@@ -17,9 +17,9 @@
  */
 package org.apache.struts.taglib.logic;
 
-import javax.servlet.ServletException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.apache.cactus.JspTestCase;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/logic/TestLessThanTag.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/logic/TestLessThanTag.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/logic/TestLessThanTag.java
@@ -17,9 +17,9 @@
  */
 package org.apache.struts.taglib.logic;
 
-import javax.servlet.ServletException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.apache.cactus.JspTestCase;
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/logic/TestNotEqualTag.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/logic/TestNotEqualTag.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/logic/TestNotEqualTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.logic;
 
-import javax.servlet.ServletException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -94,7 +94,7 @@ public class TestNotEqualTag extends Jsp
        testRequest.addCookie(COOKIE_KEY, "abc");
     }
 
-    public void testCookieStringEquals() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testCookieStringEquals() throws ServletException,  jakarta.servlet.jsp.JspException {
         net.setCookie(COOKIE_KEY);
         net.setValue(testStringValue);
 
@@ -109,7 +109,7 @@ public class TestNotEqualTag extends Jsp
        testRequest.addCookie(COOKIE_KEY, "abc");
     }
 
-    public void testCookieStringNotEquals() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testCookieStringNotEquals() throws ServletException,  jakarta.servlet.jsp.JspException {
         net.setCookie(COOKIE_KEY);
         net.setValue(testStringValue1);
 
@@ -123,7 +123,7 @@ public class TestNotEqualTag extends Jsp
        testRequest.addHeader(COOKIE_KEY, "abc");
     }
 
-    public void testHeaderStringEquals() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testHeaderStringEquals() throws ServletException,  jakarta.servlet.jsp.JspException {
         net.setHeader(COOKIE_KEY);
         net.setValue(testStringValue);
 
@@ -137,7 +137,7 @@ public class TestNotEqualTag extends Jsp
        testRequest.addHeader(COOKIE_KEY, "abc");
     }
 
-    public void testHeaderStringNotEquals() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testHeaderStringNotEquals() throws ServletException,  jakarta.servlet.jsp.JspException {
         net.setHeader(COOKIE_KEY);
         net.setValue(testStringValue1);
 
@@ -151,7 +151,7 @@ public class TestNotEqualTag extends Jsp
        testRequest.addParameter(PARAMETER_KEY, "abc");
     }
 
-    public void testParameterStringEquals() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testParameterStringEquals() throws ServletException,  jakarta.servlet.jsp.JspException {
         net.setParameter(PARAMETER_KEY);
         net.setValue(testStringValue);
 
@@ -165,7 +165,7 @@ public class TestNotEqualTag extends Jsp
        testRequest.addParameter(PARAMETER_KEY, "abc");
     }
 
-    public void testParameterStringNotEquals() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testParameterStringNotEquals() throws ServletException,  jakarta.servlet.jsp.JspException {
         net.setParameter(PARAMETER_KEY);
         net.setValue(testStringValue1);
 
@@ -175,7 +175,7 @@ public class TestNotEqualTag extends Jsp
     /**
      * Verify that two <code>String</code>s match using the <code>NotEqualTag</code>.
      */
-    public void testStringEquals() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testStringEquals() throws ServletException,  jakarta.servlet.jsp.JspException {
         request.setAttribute(testStringKey, testStringValue);
         net.setName(testStringKey);
         net.setValue(testStringValue);
@@ -186,7 +186,7 @@ public class TestNotEqualTag extends Jsp
     /**
      * Verify that two <code>String</code>s do not match using the <code>NotEqualTag</code>.
      */
-    public void testStringNotEquals() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testStringNotEquals() throws ServletException,  jakarta.servlet.jsp.JspException {
         request.setAttribute(testStringKey, testStringValue);
         net.setName(testStringKey);
         net.setValue(testStringValue1);
@@ -198,7 +198,7 @@ public class TestNotEqualTag extends Jsp
      * Verify that an <code>Integer</code> and a <code>String</code>
      * match using the <code>NotEqualTag</code>.
      */
-    public void testIntegerEquals() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testIntegerEquals() throws ServletException,  jakarta.servlet.jsp.JspException {
         request.setAttribute(testIntegerKey, testIntegerValue);
         net.setName(testIntegerKey);
         net.setValue(testIntegerValue.toString());
@@ -209,7 +209,7 @@ public class TestNotEqualTag extends Jsp
     /**
      * Verify that two <code>String</code>s do not match using the <code>NotEqualTag</code>.
      */
-    public void testIntegerNotEquals() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testIntegerNotEquals() throws ServletException,  jakarta.servlet.jsp.JspException {
         request.setAttribute(testIntegerKey, testIntegerValue);
         net.setName(testIntegerKey);
         net.setValue(testIntegerValue1.toString());
@@ -220,7 +220,7 @@ public class TestNotEqualTag extends Jsp
     /**
      * Verify that there is an application scope String in scope using the <code>EqualTag</code>.
     */
-    public void testApplicationScopeStringEquals() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testApplicationScopeStringEquals() throws ServletException,  jakarta.servlet.jsp.JspException {
         String testKey = "testApplicationScopeStringEquals";
 
         pageContext.setAttribute(testKey, testStringValue, PageContext.APPLICATION_SCOPE);
@@ -235,7 +235,7 @@ public class TestNotEqualTag extends Jsp
     /**
      * Verify that there is an application scope String that is not equal using the <code>EqualTag</code>.
     */
-    public void testApplicationScopeStringNotEquals() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testApplicationScopeStringNotEquals() throws ServletException,  jakarta.servlet.jsp.JspException {
         String testKey = "testApplicationScopeStringNotEquals";
 
         pageContext.setAttribute(testKey, testStringValue, PageContext.APPLICATION_SCOPE);
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/logic/TestNotPresentTag.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/logic/TestNotPresentTag.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/logic/TestNotPresentTag.java
@@ -17,8 +17,8 @@
  */
 package org.apache.struts.taglib.logic;
 
-import javax.servlet.ServletException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -67,7 +67,7 @@ public class TestNotPresentTag extends J
     /**
      * Verify that there is an application scope object in scope using the <code>NotPresentTag</code>.
     */
-    public void testApplicationScopeObjectPresent() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testApplicationScopeObjectPresent() throws ServletException,  jakarta.servlet.jsp.JspException {
         NotPresentTag npt = new NotPresentTag();
         String testKey = "testApplicationScopePresent";
         String testStringValue = "abc";
@@ -83,7 +83,7 @@ public class TestNotPresentTag extends J
     /**
      * Verify that there is an application scope object is not in scope using the <code>NotPresentTag</code>.
     */
-    public void testApplicationScopeObjectNotPresent() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testApplicationScopeObjectNotPresent() throws ServletException,  jakarta.servlet.jsp.JspException {
         NotPresentTag npt = new NotPresentTag();
         String testKey = "testApplicationScopeNotPresent";
 
@@ -98,7 +98,7 @@ public class TestNotPresentTag extends J
     /**
      * Verify that there is an session scope object in scope using the <code>NotPresentTag</code>.
     */
-    public void testSessionScopeObjectPresent() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testSessionScopeObjectPresent() throws ServletException,  jakarta.servlet.jsp.JspException {
         NotPresentTag npt = new NotPresentTag();
         String testKey = "testSessionScopePresent";
         String testStringValue = "abc";
@@ -114,7 +114,7 @@ public class TestNotPresentTag extends J
     /**
      * Verify that there is an session scope object is not in scope using the <code>NotPresentTag</code>.
     */
-    public void testSessionScopeObjectNotPresent() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testSessionScopeObjectNotPresent() throws ServletException,  jakarta.servlet.jsp.JspException {
         NotPresentTag npt = new NotPresentTag();
         String testKey = "testSessionScopeNotPresent";
 
@@ -128,7 +128,7 @@ public class TestNotPresentTag extends J
     /**
      * Verify that there is an request scope object in scope using the <code>NotPresentTag</code>.
     */
-    public void testRequestScopeObjectPresent() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testRequestScopeObjectPresent() throws ServletException,  jakarta.servlet.jsp.JspException {
         NotPresentTag npt = new NotPresentTag();
         String testKey = "testRequestScopePresent";
         String testStringValue = "abc";
@@ -144,7 +144,7 @@ public class TestNotPresentTag extends J
     /**
      * Verify that there is an request scope object is not in scope using the <code>NotPresentTag</code>.
     */
-    public void testRequestScopeObjectNotPresent() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testRequestScopeObjectNotPresent() throws ServletException,  jakarta.servlet.jsp.JspException {
         NotPresentTag npt = new NotPresentTag();
         String testKey = "testRequestScopeNotPresent";
 
@@ -158,7 +158,7 @@ public class TestNotPresentTag extends J
     /**
      * Verify that there is an page scope object in scope using the <code>NotPresentTag</code>.
     */
-    public void testPageScopeObjectPresent() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testPageScopeObjectPresent() throws ServletException,  jakarta.servlet.jsp.JspException {
         NotPresentTag npt = new NotPresentTag();
         String testKey = "testPageScopePresent";
         String testStringValue = "abc";
@@ -174,7 +174,7 @@ public class TestNotPresentTag extends J
     /**
      * Verify that there is an page scope object is not in scope using the <code>NotPresentTag</code>.
     */
-    public void testPageScopeObjectNotPresent() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testPageScopeObjectNotPresent() throws ServletException,  jakarta.servlet.jsp.JspException {
         NotPresentTag npt = new NotPresentTag();
         String testKey = "testPageScopeNotPresent";
 
@@ -198,7 +198,7 @@ public class TestNotPresentTag extends J
      * Verify that there is an cookie using the <code>PresentTag</code>.
     */
     /* FIXME: Cactus does not send cookies?
-    public void testCookiePresent() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testCookiePresent() throws ServletException,  jakarta.servlet.jsp.JspException {
         NotPresentTag npt = new NotPresentTag();
 
         npt.setPageContext(pageContext);
@@ -211,7 +211,7 @@ public class TestNotPresentTag extends J
     /**
      * Verify that there isn't an cookie using the <code>PresentTag</code>.
     */
-    public void testCookieNotPresent() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testCookieNotPresent() throws ServletException,  jakarta.servlet.jsp.JspException {
         NotPresentTag npt = new NotPresentTag();
 
         npt.setPageContext(pageContext);
@@ -230,7 +230,7 @@ public class TestNotPresentTag extends J
     /**
      * Verify that there is an header using the <code>PresentTag</code>.
     */
-    public void testHeaderPresent() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testHeaderPresent() throws ServletException,  jakarta.servlet.jsp.JspException {
         NotPresentTag npt = new NotPresentTag();
 
         npt.setPageContext(pageContext);
@@ -242,7 +242,7 @@ public class TestNotPresentTag extends J
     /**
      * Verify that there isn't an header using the <code>PresentTag</code>.
     */
-    public void testHeaderNotPresent() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testHeaderNotPresent() throws ServletException,  jakarta.servlet.jsp.JspException {
         NotPresentTag npt = new NotPresentTag();
 
         npt.setPageContext(pageContext);
@@ -261,7 +261,7 @@ public class TestNotPresentTag extends J
     /**
      * Verify that there is an parameter using the <code>PresentTag</code>.
     */
-    public void testParameterPresent() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testParameterPresent() throws ServletException,  jakarta.servlet.jsp.JspException {
         NotPresentTag npt = new NotPresentTag();
 
         npt.setPageContext(pageContext);
@@ -273,7 +273,7 @@ public class TestNotPresentTag extends J
     /**
      * Verify that there isn't an parameter using the <code>PresentTag</code>.
     */
-    public void testParameterNotPresent() throws ServletException,  javax.servlet.jsp.JspException {
+    public void testParameterNotPresent() throws ServletException,  jakarta.servlet.jsp.JspException {
         NotPresentTag npt = new NotPresentTag();
 
         npt.setPageContext(pageContext);
Index: struts-1.2.9-src/src/test/org/apache/struts/taglib/logic/TestPresentTag.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/taglib/logic/TestPresentTag.java
+++ struts-1.2.9-src/src/test/org/apache/struts/taglib/logic/TestPresentTag.java
@@ -17,9 +17,9 @@
  */
 package org.apache.struts.taglib.logic;
  
-import javax.servlet.ServletException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.apache.cactus.JspTestCase;
Index: struts-1.2.9-src/src/test/org/apache/struts/tiles/CustomI18nFactorySet.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/tiles/CustomI18nFactorySet.java
+++ struts-1.2.9-src/src/test/org/apache/struts/tiles/CustomI18nFactorySet.java
@@ -21,8 +21,8 @@ package org.apache.struts.tiles;
 
 import java.util.Map;
 import java.util.Locale;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
 import org.apache.struts.tiles.xmlDefinition.I18nFactorySet;
 /**
  * <p>Test I18nFactorySet.</p>
Index: struts-1.2.9-src/src/test/org/apache/struts/tiles/TestTilesPlugin.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/tiles/TestTilesPlugin.java
+++ struts-1.2.9-src/src/test/org/apache/struts/tiles/TestTilesPlugin.java
@@ -20,15 +20,15 @@
 package org.apache.struts.tiles;
 
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Locale;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.struts.Globals;
 import org.apache.struts.action.PlugIn;
Index: struts-1.2.9-src/src/test/org/apache/struts/util/TestRequestUtils.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/util/TestRequestUtils.java
+++ struts-1.2.9-src/src/test/org/apache/struts/util/TestRequestUtils.java
@@ -24,7 +24,7 @@ import java.net.MalformedURLException;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/test/org/apache/struts/util/TestRequestUtilsPopulate.java
===================================================================
--- struts-1.2.9-src.orig/src/test/org/apache/struts/util/TestRequestUtilsPopulate.java
+++ struts-1.2.9-src/src/test/org/apache/struts/util/TestRequestUtilsPopulate.java
@@ -18,7 +18,7 @@
 
 package org.apache.struts.util;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
Index: struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/channel/ChannelFactorySet.java
===================================================================
--- struts-1.2.9-src.orig/src/tiles-documentation/org/apache/struts/webapp/tiles/channel/ChannelFactorySet.java
+++ struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/channel/ChannelFactorySet.java
@@ -23,10 +23,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts.tiles.DefinitionsFactoryException;
Index: struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/channel/SelectChannelAction.java
===================================================================
--- struts-1.2.9-src.orig/src/tiles-documentation/org/apache/struts/webapp/tiles/channel/SelectChannelAction.java
+++ struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/channel/SelectChannelAction.java
@@ -18,9 +18,9 @@
 
 package org.apache.struts.webapp.tiles.channel;
 
-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 org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
Index: struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/dynPortal/RetrievePortalAction.java
===================================================================
--- struts-1.2.9-src.orig/src/tiles-documentation/org/apache/struts/webapp/tiles/dynPortal/RetrievePortalAction.java
+++ struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/dynPortal/RetrievePortalAction.java
@@ -19,10 +19,10 @@
 package org.apache.struts.webapp.tiles.dynPortal;
 
 import java.util.List;
-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 org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
Index: struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/dynPortal/SetPortalPrefsAction.java
===================================================================
--- struts-1.2.9-src.orig/src/tiles-documentation/org/apache/struts/webapp/tiles/dynPortal/SetPortalPrefsAction.java
+++ struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/dynPortal/SetPortalPrefsAction.java
@@ -18,10 +18,10 @@
 
 package org.apache.struts.webapp.tiles.dynPortal;
 
-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 org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
Index: struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/invoice/EditInvoiceAction.java
===================================================================
--- struts-1.2.9-src.orig/src/tiles-documentation/org/apache/struts/webapp/tiles/invoice/EditInvoiceAction.java
+++ struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/invoice/EditInvoiceAction.java
@@ -18,9 +18,9 @@
 package org.apache.struts.webapp.tiles.invoice;
 
 import java.util.Locale;
-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 org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
Index: struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/lang/SelectLocaleAction.java
===================================================================
--- struts-1.2.9-src.orig/src/tiles-documentation/org/apache/struts/webapp/tiles/lang/SelectLocaleAction.java
+++ struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/lang/SelectLocaleAction.java
@@ -19,9 +19,9 @@
 package org.apache.struts.webapp.tiles.lang;
 
 import java.util.Locale;
-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 org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
Index: struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/portal/UserMenuAction.java
===================================================================
--- struts-1.2.9-src.orig/src/tiles-documentation/org/apache/struts/webapp/tiles/portal/UserMenuAction.java
+++ struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/portal/UserMenuAction.java
@@ -23,11 +23,11 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -327,7 +327,7 @@ public final class UserMenuAction extend
 	}
 
 	/**
-	 * @see org.apache.struts.tiles.Controller#execute(org.apache.struts.tiles.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext)
+	 * @see org.apache.struts.tiles.Controller#execute(org.apache.struts.tiles.ComponentContext, jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse, jakarta.servlet.ServletContext)
 	 */
 	public void execute(
 		ComponentContext tileContext,
Index: struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/portal/UserMenuSettingsAction.java
===================================================================
--- struts-1.2.9-src.orig/src/tiles-documentation/org/apache/struts/webapp/tiles/portal/UserMenuSettingsAction.java
+++ struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/portal/UserMenuSettingsAction.java
@@ -22,8 +22,8 @@ import java.util.ArrayList;
 import java.util.Iterator;
 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.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
Index: struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/portal/UserPortalAction.java
===================================================================
--- struts-1.2.9-src.orig/src/tiles-documentation/org/apache/struts/webapp/tiles/portal/UserPortalAction.java
+++ struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/portal/UserPortalAction.java
@@ -20,10 +20,10 @@ package org.apache.struts.webapp.tiles.p
 
 import java.util.List;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
Index: struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/portal/UserPortalSettingsAction.java
===================================================================
--- struts-1.2.9-src.orig/src/tiles-documentation/org/apache/struts/webapp/tiles/portal/UserPortalSettingsAction.java
+++ struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/portal/UserPortalSettingsAction.java
@@ -18,8 +18,8 @@
 
 package org.apache.struts.webapp.tiles.portal;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
Index: struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/rssChannel/Channels.java
===================================================================
--- struts-1.2.9-src.orig/src/tiles-documentation/org/apache/struts/webapp/tiles/rssChannel/Channels.java
+++ struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/rssChannel/Channels.java
@@ -21,9 +21,9 @@ package org.apache.struts.webapp.tiles.r
 import java.util.ArrayList;
 import java.util.List;
 
-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.commons.digester.rss.Channel;
 import org.apache.commons.digester.rss.RSSDigester;
Index: struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/rssChannel/RssChannelsAction.java
===================================================================
--- struts-1.2.9-src.orig/src/tiles-documentation/org/apache/struts/webapp/tiles/rssChannel/RssChannelsAction.java
+++ struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/rssChannel/RssChannelsAction.java
@@ -21,8 +21,8 @@ package org.apache.struts.webapp.tiles.r
 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.commons.digester.rss.Channel;
 import org.apache.commons.digester.rss.RSSDigester;
Index: struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/skin/DefinitionCatalog.java
===================================================================
--- struts-1.2.9-src.orig/src/tiles-documentation/org/apache/struts/webapp/tiles/skin/DefinitionCatalog.java
+++ struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/skin/DefinitionCatalog.java
@@ -24,8 +24,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.struts.tiles.ComponentDefinition;
 import org.apache.struts.tiles.DefinitionsFactoryException;
Index: struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/skin/LayoutSettingsAction.java
===================================================================
--- struts-1.2.9-src.orig/src/tiles-documentation/org/apache/struts/webapp/tiles/skin/LayoutSettingsAction.java
+++ struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/skin/LayoutSettingsAction.java
@@ -18,8 +18,8 @@
 
 package org.apache.struts.webapp.tiles.skin;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
Index: struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/skin/LayoutSwitchAction.java
===================================================================
--- struts-1.2.9-src.orig/src/tiles-documentation/org/apache/struts/webapp/tiles/skin/LayoutSwitchAction.java
+++ struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/skin/LayoutSwitchAction.java
@@ -18,12 +18,12 @@
 
 package org.apache.struts.webapp.tiles.skin;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
Index: struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/skin/SimpleSwitchLayoutAction.java
===================================================================
--- struts-1.2.9-src.orig/src/tiles-documentation/org/apache/struts/webapp/tiles/skin/SimpleSwitchLayoutAction.java
+++ struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/skin/SimpleSwitchLayoutAction.java
@@ -18,12 +18,12 @@
 
 package org.apache.struts.webapp.tiles.skin;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
Index: struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/template/DynTemplateAction.java
===================================================================
--- struts-1.2.9-src.orig/src/tiles-documentation/org/apache/struts/webapp/tiles/template/DynTemplateAction.java
+++ struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/template/DynTemplateAction.java
@@ -18,8 +18,8 @@
 
 package org.apache.struts.webapp.tiles.template;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
Index: struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/test/NoForward.java
===================================================================
--- struts-1.2.9-src.orig/src/tiles-documentation/org/apache/struts/webapp/tiles/test/NoForward.java
+++ struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/test/NoForward.java
@@ -18,8 +18,8 @@
 
 package org.apache.struts.webapp.tiles.test;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
Index: struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/test/TestActionTileAction.java
===================================================================
--- struts-1.2.9-src.orig/src/tiles-documentation/org/apache/struts/webapp/tiles/test/TestActionTileAction.java
+++ struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/test/TestActionTileAction.java
@@ -18,8 +18,8 @@
 
 package org.apache.struts.webapp.tiles.test;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
Index: struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/test/TestTileController.java
===================================================================
--- struts-1.2.9-src.orig/src/tiles-documentation/org/apache/struts/webapp/tiles/test/TestTileController.java
+++ struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/test/TestTileController.java
@@ -20,10 +20,10 @@ package org.apache.struts.webapp.tiles.t
 
 import java.io.IOException;
 
-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 org.apache.struts.tiles.ComponentContext;
 import org.apache.struts.tiles.ControllerSupport;
Index: struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/tutorial/ForwardExampleAction.java
===================================================================
--- struts-1.2.9-src.orig/src/tiles-documentation/org/apache/struts/webapp/tiles/tutorial/ForwardExampleAction.java
+++ struts-1.2.9-src/src/tiles-documentation/org/apache/struts/webapp/tiles/tutorial/ForwardExampleAction.java
@@ -18,8 +18,8 @@
 
 package org.apache.struts.webapp.tiles.tutorial;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
Index: struts-1.2.9-src/build.xml
===================================================================
--- struts-1.2.9-src.orig/build.xml
+++ struts-1.2.9-src/build.xml
@@ -214,7 +214,7 @@
       <pathelement location="${commons-beanutils.jar}"/>
       <pathelement location="${commons-digester.jar}"/>
       <pathelement location="${commons-fileupload2-core.jar}"/>
-      <pathelement location="${commons-fileupload2-javax.jar}"/>
+      <pathelement location="${commons-fileupload2-jakarta-servlet6.jar}"/>
       <pathelement location="${commons-io.jar}"/>
       <pathelement location="${commons-logging.jar}"/>
       <pathelement location="${commons-validator.jar}"/>
@@ -332,7 +332,7 @@
         <property name="commons-beanutils.jar"  value="${libdir}/commons-beanutils.jar"/>
         <property name="commons-digester.jar"   value="${libdir}/commons-digester.jar"/>
         <property name="commons-fileupload2-core.jar"   value="${libdir}/commons-fileupload2-core.jar"/>
-        <property name="commons-fileupload2-javax.jar"   value="${libdir}/commons-fileupload2-javax.jar"/>
+        <property name="commons-fileupload2-jakarta-servlet6.jar"   value="${libdir}/commons-fileupload2-jakarta-servlet6.jar"/>
         <property name="commons-io.jar"   value="${libdir}/commons-io.jar"/>
         <property name="commons-logging.jar"    value="${libdir}/commons-logging.jar"/>
         <property name="commons-validator.jar"  value="${libdir}/commons-validator.jar"/>
@@ -371,8 +371,8 @@
             tofile="${build.home}/library/commons-digester.jar"/>
         <copy file="${commons-fileupload2-core.jar}"
             tofile="${build.home}/library/commons-fileupload2-core.jar"/>
-        <copy file="${commons-fileupload2-javax.jar}"
-            tofile="${build.home}/library/commons-fileupload2-javax.jar"/>
+        <copy file="${commons-fileupload2-jakarta-servlet6.jar}"
+            tofile="${build.home}/library/commons-fileupload2-jakarta-servlet6.jar"/>
         <copy file="${commons-io.jar}"
             tofile="${build.home}/library/commons-io.jar"/>
         <copy file="${commons-logging.jar}"
Index: struts-1.2.9-src/build-webapp.xml
===================================================================
--- struts-1.2.9-src.orig/build-webapp.xml
+++ struts-1.2.9-src/build-webapp.xml
@@ -172,7 +172,7 @@
   <pathelement location="${commons-beanutils.jar}"/>
   <pathelement location="${commons-digester.jar}"/>
   <pathelement location="${commons-fileupload2-core.jar}"/>
-  <pathelement location="${commons-fileupload2-javax.jar}"/>
+  <pathelement location="${commons-fileupload2-jakarta-servlet6.jar}"/>
   <pathelement location="${commons-io.jar}"/>
   <pathelement location="${commons-logging.jar}"/>
   <pathelement location="${commons-validator.jar}"/>
Index: struts-1.2.9-src/src/share/org/apache/struts/upload/MultipartRequestWrapper.java
===================================================================
--- struts-1.2.9-src.orig/src/share/org/apache/struts/upload/MultipartRequestWrapper.java
+++ struts-1.2.9-src/src/share/org/apache/struts/upload/MultipartRequestWrapper.java
@@ -29,11 +29,12 @@ import java.util.Enumeration;
 import java.io.IOException;
 import java.io.BufferedReader;
 import java.security.Principal;
-import javax.servlet.ServletInputStream;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 import java.lang.reflect.InvocationTargetException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -43,7 +44,7 @@ import org.apache.commons.beanutils.Meth
  * This class functions as a wrapper around HttpServletRequest to
  * provide working getParameter methods for multipart requests.  Once
  * Struts requires Servlet 2.3, this class will definately be changed to
- * extend javax.servlet.http.HttpServletRequestWrapper instead of
+ * extend jakarta.servlet.http.HttpServletRequestWrapper instead of
  * implementing HttpServletRequest.  Servlet 2.3 methods are implemented
  * to return <code>null</code> or do nothing if called on.  Use
  * {@link #getRequest() getRequest} to retrieve the underlying HttpServletRequest
@@ -53,7 +54,7 @@ import org.apache.commons.beanutils.Meth
  * and just after the Action is performed, the request is set back to the original
  * HttpServletRequest object.
  */
-public class MultipartRequestWrapper implements HttpServletRequest {
+public class MultipartRequestWrapper extends HttpServletRequestWrapper {
 
     /** Logging instance */
     private static final Log log = LogFactory.getLog(MultipartRequestWrapper.class);
@@ -69,6 +70,7 @@ public class MultipartRequestWrapper imp
     protected HttpServletRequest request;
     
     public MultipartRequestWrapper(HttpServletRequest request) {
+        super(request);
         this.request = request;
         this.parameters = new HashMap();
     }
@@ -200,7 +202,7 @@ public class MultipartRequestWrapper imp
         return request.getRequestDispatcher(path);
     }
     public String getRealPath(String path) {
-        return request.getRealPath(path);
+        return request.getServletContext().getRealPath(path);
     }
     
     //WRAPPER IMPLEMENTATIONS OF HTTPSERVLETREQUEST METHODS
@@ -271,7 +273,7 @@ public class MultipartRequestWrapper imp
         return request.isRequestedSessionIdFromURL();
     }
     public boolean isRequestedSessionIdFromUrl() {
-        return request.isRequestedSessionIdFromUrl();
+        return request.isRequestedSessionIdFromURL();
     }
     
     //SERVLET 2.3 METHODS
@@ -359,7 +361,7 @@ public class MultipartRequestWrapper imp
             return MethodUtils.invokeExactMethod(request, name, args);
         } catch (NoSuchMethodException e) {
             if (log.isDebugEnabled()) {
-                log.debug("Method '" +name + "' not defined for javax.servlet.http.HttpServletRequest");
+                log.debug("Method '" +name + "' not defined for jakarta.servlet.http.HttpServletRequest");
             }
         } catch (InvocationTargetException e) {
             log.error("Error invoking method '" +name + "' ", e.getTargetException());