getMultiPartParameterMap(HttpServletRequest re
} else {
if (encoding != null) {
try {
- multiPartMap.put(fieldName, item.getString(encoding));
- } catch (java.io.UnsupportedEncodingException uee) {
- Debug.logError(uee, "Unsupported Encoding, using deafault", MODULE);
+ multiPartMap.put(fieldName, item.getString(Charset.forName(encoding)));
+ } catch (IOException e) {
+ Debug.logError(e, "Unsupported Encoding, using deafault", MODULE);
multiPartMap.put(fieldName, item.getString());
}
} else {
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java
index 52a4e8578e2..02cb4d2584b 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java
@@ -23,7 +23,7 @@
import java.util.Map;
import java.util.Objects;
-import javax.el.PropertyNotFoundException;
+import jakarta.el.PropertyNotFoundException;
import org.apache.ofbiz.base.lang.IsEmpty;
import org.apache.ofbiz.base.lang.SourceMonitored;
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleServletAccessor.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleServletAccessor.java
index c8d38c5dcf4..4f32e567301 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleServletAccessor.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleServletAccessor.java
@@ -22,8 +22,8 @@
import java.util.List;
import java.util.Map;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpSession;
import org.apache.ofbiz.base.util.UtilGenerics;
import org.apache.ofbiz.base.util.UtilValidate;
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java
index 64da2d6920a..6b3d77ffc33 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java
@@ -26,7 +26,7 @@
import java.util.Map;
import java.util.TimeZone;
-import javax.el.PropertyNotFoundException;
+import jakarta.el.PropertyNotFoundException;
import org.apache.ofbiz.base.lang.IsEmpty;
import org.apache.ofbiz.base.lang.SourceMonitored;
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/JuelConnector.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/JuelConnector.java
index eeb70e7dbf5..8aae7caabdb 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/JuelConnector.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/JuelConnector.java
@@ -18,34 +18,32 @@
*******************************************************************************/
package org.apache.ofbiz.base.util.string;
-import static de.odysseus.el.tree.impl.Scanner.Symbol.END_EVAL;
-import static de.odysseus.el.tree.impl.Scanner.Symbol.FLOAT;
-import static de.odysseus.el.tree.impl.Scanner.Symbol.START_EVAL_DEFERRED;
-import static de.odysseus.el.tree.impl.Scanner.Symbol.START_EVAL_DYNAMIC;
-
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ExpressionFactory;
-import javax.el.PropertyNotFoundException;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.PropertyNotFoundException;
+import org.activiti.core.el.juel.ExpressionFactoryImpl;
+import org.activiti.core.el.juel.misc.LocalMessages;
+import org.activiti.core.el.juel.tree.Bindings;
+import org.activiti.core.el.juel.tree.Tree;
+import org.activiti.core.el.juel.tree.TreeStore;
+import org.activiti.core.el.juel.tree.impl.Builder;
+import org.activiti.core.el.juel.tree.impl.Cache;
+import org.activiti.core.el.juel.tree.impl.Parser;
+import org.activiti.core.el.juel.tree.impl.Scanner;
+import org.activiti.core.el.juel.tree.impl.ast.AstBracket;
+import org.activiti.core.el.juel.tree.impl.ast.AstDot;
+import org.activiti.core.el.juel.tree.impl.ast.AstEval;
+import org.activiti.core.el.juel.tree.impl.ast.AstIdentifier;
+import org.activiti.core.el.juel.tree.impl.ast.AstNode;
import org.apache.ofbiz.base.util.Debug;
-import de.odysseus.el.ExpressionFactoryImpl;
-import de.odysseus.el.misc.LocalMessages;
-import de.odysseus.el.tree.Bindings;
-import de.odysseus.el.tree.Tree;
-import de.odysseus.el.tree.TreeStore;
-import de.odysseus.el.tree.impl.Builder;
-import de.odysseus.el.tree.impl.Cache;
-import de.odysseus.el.tree.impl.Parser;
-import de.odysseus.el.tree.impl.Parser.ParseException;
-import de.odysseus.el.tree.impl.Scanner.ScanException;
-import de.odysseus.el.tree.impl.Scanner.Symbol;
-import de.odysseus.el.tree.impl.ast.AstBracket;
-import de.odysseus.el.tree.impl.ast.AstDot;
-import de.odysseus.el.tree.impl.ast.AstEval;
-import de.odysseus.el.tree.impl.ast.AstIdentifier;
-import de.odysseus.el.tree.impl.ast.AstNode;
+import static org.activiti.core.el.juel.tree.impl.Scanner.Symbol.END_EVAL;
+import static org.activiti.core.el.juel.tree.impl.Scanner.Symbol.FLOAT;
+import static org.activiti.core.el.juel.tree.impl.Scanner.Symbol.START_EVAL_DEFERRED;
+import static org.activiti.core.el.juel.tree.impl.Scanner.Symbol.START_EVAL_DYNAMIC;
+
/** A facade class used to connect the OFBiz framework to the JUEL library.
*The Unified Expression Language specification doesn't allow assignment of
@@ -145,9 +143,9 @@ public ExtendedParser(Builder context, String input) {
super(context, input);
}
@Override
- protected AstEval eval(boolean required, boolean deferred) throws ScanException, ParseException {
+ protected AstEval eval(boolean required, boolean deferred) throws Scanner.ScanException, ParseException {
AstEval v = null;
- Symbol startEval = deferred ? START_EVAL_DEFERRED : START_EVAL_DYNAMIC;
+ Scanner.Symbol startEval = deferred ? START_EVAL_DEFERRED : START_EVAL_DYNAMIC;
if (this.getToken().getSymbol() == startEval) {
consumeToken();
AstNode node = expr(true);
@@ -187,7 +185,7 @@ protected static class ExtendedBuilder extends Builder {
public Tree build(String expression) throws ELException {
try {
return new ExtendedParser(this, expression).tree();
- } catch (ScanException | ParseException e) {
+ } catch (Scanner.ScanException | Parser.ParseException e) {
throw new ELException(LocalMessages.get("error.build", expression, e.getMessage()));
}
}
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java
index 84749ab38b2..e6ca134368f 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java
@@ -23,9 +23,9 @@
import java.util.Iterator;
import java.util.List;
-import javax.el.ELContext;
-import javax.el.ELResolver;
-import javax.el.PropertyNotWritableException;
+import jakarta.el.ELContext;
+import jakarta.el.ELResolver;
+import jakarta.el.PropertyNotWritableException;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpression;
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java
index 0089d7848e9..3d8f924a2d4 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java
@@ -35,7 +35,7 @@
import java.util.Map;
import java.util.TimeZone;
-import javax.el.FunctionMapper;
+import jakarta.el.FunctionMapper;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java
index cd34a35800d..d519ef2cbea 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java
@@ -25,20 +25,20 @@
import java.util.Locale;
import java.util.Map;
-import javax.el.ArrayELResolver;
-import javax.el.BeanELResolver;
-import javax.el.CompositeELResolver;
-import javax.el.ELContext;
-import javax.el.ELResolver;
-import javax.el.ExpressionFactory;
-import javax.el.FunctionMapper;
-import javax.el.ListELResolver;
-import javax.el.MapELResolver;
-import javax.el.PropertyNotFoundException;
-import javax.el.PropertyNotWritableException;
-import javax.el.ResourceBundleELResolver;
-import javax.el.ValueExpression;
-import javax.el.VariableMapper;
+import jakarta.el.ArrayELResolver;
+import jakarta.el.BeanELResolver;
+import jakarta.el.CompositeELResolver;
+import jakarta.el.ELContext;
+import jakarta.el.ELResolver;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.FunctionMapper;
+import jakarta.el.ListELResolver;
+import jakarta.el.MapELResolver;
+import jakarta.el.PropertyNotFoundException;
+import jakarta.el.PropertyNotWritableException;
+import jakarta.el.ResourceBundleELResolver;
+import jakarta.el.ValueExpression;
+import jakarta.el.VariableMapper;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.StringUtil;
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java
index 108eb98c3ff..2a763cd3869 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java
@@ -33,8 +33,8 @@
import java.util.TimeZone;
import java.util.stream.Stream;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.ofbiz.base.component.ComponentConfig;
import org.apache.ofbiz.base.location.FlexibleLocation;
diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilHttpTest.java b/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilHttpTest.java
index 2842dbd5054..887db984db9 100644
--- a/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilHttpTest.java
+++ b/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilHttpTest.java
@@ -39,7 +39,7 @@
import java.util.Map;
import java.util.function.Predicate;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import javax.ws.rs.HttpMethod;
import org.hamcrest.Matchers;
diff --git a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java
index 6a05583c8b1..833fefd826c 100644
--- a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java
+++ b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java
@@ -20,8 +20,8 @@
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
diff --git a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SslAcceleratorValve.java b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SslAcceleratorValve.java
index b65bc482f20..a91f3c25c80 100644
--- a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SslAcceleratorValve.java
+++ b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SslAcceleratorValve.java
@@ -20,7 +20,7 @@
import java.io.IOException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
diff --git a/framework/common/servicedef/services.xml b/framework/common/servicedef/services.xml
index c0856693214..16cdf972535 100644
--- a/framework/common/servicedef/services.xml
+++ b/framework/common/servicedef/services.xml
@@ -408,7 +408,7 @@ under the License.
Used to Automatically Authenticate a username/password; create a UserLogin object
-
+
Used to Automatically Authenticate a username/password; create a UserLogin object
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java b/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java
index 9081da61640..f3c74b01aa8 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java
@@ -37,9 +37,9 @@
import java.util.Map;
import javax.imageio.ImageIO;
-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.lang.RandomStringUtils;
import org.apache.commons.lang.StringUtils;
@@ -71,13 +71,13 @@ public class CommonEvents {
// Attributes removed for security reason; _ERROR_MESSAGE_ and _ERROR_MESSAGE_LIST are kept
private static final String[] IGNOREATTRS = new String[] {
- "javax.servlet.request.key_size",
+ "jakarta.servlet.request.key_size",
"_CONTEXT_ROOT_",
"_FORWARDED_FROM_SERVLET_",
- "javax.servlet.request.ssl_session",
- "javax.servlet.request.ssl_session_id",
+ "jakarta.servlet.request.ssl_session",
+ "jakarta.servlet.request.ssl_session_id",
"multiPartMap",
- "javax.servlet.request.cipher_suite",
+ "jakarta.servlet.request.cipher_suite",
"targetRequestUri",
"_SERVER_ROOT_URL_",
"_CONTROL_PATH_",
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/UrlServletHelper.java b/framework/common/src/main/java/org/apache/ofbiz/common/UrlServletHelper.java
index 63c6856aa8d..b4b9c2c674f 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/UrlServletHelper.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/UrlServletHelper.java
@@ -21,13 +21,13 @@
import java.io.IOException;
import java.util.List;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.StringUtil;
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
index c125a39d8dc..a24bbf60d49 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
@@ -31,8 +31,8 @@
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
import javax.transaction.Transaction;
import org.apache.ofbiz.base.crypto.HashCrypt;
@@ -224,7 +224,7 @@ public static Map userLogin(DispatchContext ctx, Map
// check whether to sign in with Tomcat SSO
boolean useTomcatSSO = EntityUtilProperties.propertyValueEquals("security", "security.login.tomcat.sso", "true");
- HttpServletRequest request = (javax.servlet.http.HttpServletRequest) context.get("request");
+ HttpServletRequest request = (jakarta.servlet.http.HttpServletRequest) context.get("request");
// when request is not supplied, we will treat that SSO is not required as
// in the usage of userLogin service in ICalWorker.java
useTomcatSSO = useTomcatSSO && (request != null);
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java b/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java
index 3cfb0d0b87d..88fd86de2ec 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java
@@ -25,9 +25,9 @@
import java.util.Map;
import javax.imageio.ImageIO;
-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.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilHttp;
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java b/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java
index b97c48c1204..7dac52b6668 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java
@@ -28,8 +28,8 @@
import javax.script.ScriptContext;
import javax.script.ScriptEngine;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ofbiz.base.util.Assert;
import org.apache.ofbiz.base.util.ScriptUtil;
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusWorker.java b/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusWorker.java
index 2562e0455d5..f66fd2bf6b9 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusWorker.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusWorker.java
@@ -21,7 +21,7 @@
import java.util.LinkedList;
import java.util.List;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.entity.Delegator;
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/permission/EntityPermissionChecker.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/permission/EntityPermissionChecker.java
index d7ed327066e..b86b4c8b6ec 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/permission/EntityPermissionChecker.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/permission/EntityPermissionChecker.java
@@ -28,8 +28,8 @@
import java.util.Map;
import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.StringUtil;
diff --git a/framework/minilang/dtd/simple-methods.xsd b/framework/minilang/dtd/simple-methods.xsd
index 0d6568d8485..61728047ba7 100644
--- a/framework/minilang/dtd/simple-methods.xsd
+++ b/framework/minilang/dtd/simple-methods.xsd
@@ -301,7 +301,7 @@ under the License.
- The name of the field containing the javax.servlet.ServletRequest object. Defaults to "request".
+ The name of the field containing the jakarta.servlet.ServletRequest object. Defaults to "request".
Used when the simple method is invoked as an event, it is ignored otherwise.
@@ -312,7 +312,7 @@ under the License.
- The name of the field containing the javax.servlet.ServletResponse object. Defaults to "response".
+ The name of the field containing the jakarta.servlet.ServletResponse object. Defaults to "response".
Used when the simple method is invoked as an event, it is ignored otherwise.
@@ -323,7 +323,7 @@ under the License.
- The name of the field containing the javax.servlet.http.HttpSession object. Defaults to "session".
+ The name of the field containing the jakarta.servlet.http.HttpSession object. Defaults to "session".
Used when the simple method is invoked as an event, it is ignored otherwise.
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java
index 7572f202992..4a86c58a2d7 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java
@@ -32,8 +32,8 @@
import java.util.ServiceLoader;
import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ofbiz.base.location.FlexibleLocation;
import org.apache.ofbiz.base.util.Assert;
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java
index a60a0d03b91..b6bddf9e08c 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java
@@ -23,8 +23,8 @@
import java.util.Map;
import java.util.TimeZone;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilHttp;
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java
index 8bdf5ef1ef5..76d4efda241 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java
@@ -20,7 +20,7 @@
import java.net.URL;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.apache.ofbiz.base.util.UtilProperties;
import org.apache.ofbiz.base.util.collections.FlexibleMapAccessor;
diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/CsrfDefenseStrategy.java b/framework/security/src/main/java/org/apache/ofbiz/security/CsrfDefenseStrategy.java
index 40b63eb5055..5d9d65ca16e 100644
--- a/framework/security/src/main/java/org/apache/ofbiz/security/CsrfDefenseStrategy.java
+++ b/framework/security/src/main/java/org/apache/ofbiz/security/CsrfDefenseStrategy.java
@@ -21,7 +21,7 @@
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilProperties;
diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/CsrfUtil.java b/framework/security/src/main/java/org/apache/ofbiz/security/CsrfUtil.java
index 25b2157afa1..66331da6fc5 100644
--- a/framework/security/src/main/java/org/apache/ofbiz/security/CsrfUtil.java
+++ b/framework/security/src/main/java/org/apache/ofbiz/security/CsrfUtil.java
@@ -25,8 +25,8 @@
import java.util.Map;
import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
import javax.ws.rs.core.MultivaluedHashMap;
import org.apache.commons.lang.StringUtils;
diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/ICsrfDefenseStrategy.java b/framework/security/src/main/java/org/apache/ofbiz/security/ICsrfDefenseStrategy.java
index fc2b2279810..acb07d76249 100644
--- a/framework/security/src/main/java/org/apache/ofbiz/security/ICsrfDefenseStrategy.java
+++ b/framework/security/src/main/java/org/apache/ofbiz/security/ICsrfDefenseStrategy.java
@@ -18,7 +18,7 @@
*******************************************************************************/
package org.apache.ofbiz.security;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.ofbiz.webapp.control.RequestHandlerExceptionAllowExternalRequests;
diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/NoCsrfDefenseStrategy.java b/framework/security/src/main/java/org/apache/ofbiz/security/NoCsrfDefenseStrategy.java
index 302ba3b3b18..b1a0834b1b3 100644
--- a/framework/security/src/main/java/org/apache/ofbiz/security/NoCsrfDefenseStrategy.java
+++ b/framework/security/src/main/java/org/apache/ofbiz/security/NoCsrfDefenseStrategy.java
@@ -18,7 +18,7 @@
*******************************************************************************/
package org.apache.ofbiz.security;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
public class NoCsrfDefenseStrategy implements ICsrfDefenseStrategy {
diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/SecuredFreemarker.java b/framework/security/src/main/java/org/apache/ofbiz/security/SecuredFreemarker.java
index b0b788d0ecf..ef91dc96232 100644
--- a/framework/security/src/main/java/org/apache/ofbiz/security/SecuredFreemarker.java
+++ b/framework/security/src/main/java/org/apache/ofbiz/security/SecuredFreemarker.java
@@ -24,8 +24,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.http.client.utils.URLEncodedUtils;
import org.apache.http.message.BasicNameValuePair;
import org.apache.ofbiz.base.util.Debug;
diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/Security.java b/framework/security/src/main/java/org/apache/ofbiz/security/Security.java
index 8798da4e01a..dc441ef273d 100644
--- a/framework/security/src/main/java/org/apache/ofbiz/security/Security.java
+++ b/framework/security/src/main/java/org/apache/ofbiz/security/Security.java
@@ -21,7 +21,7 @@
import java.util.Iterator;
import java.util.List;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
import org.apache.ofbiz.entity.Delegator;
import org.apache.ofbiz.entity.GenericValue;
diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/SecurityFactory.java b/framework/security/src/main/java/org/apache/ofbiz/security/SecurityFactory.java
index 6a98f808daa..64e14b37815 100644
--- a/framework/security/src/main/java/org/apache/ofbiz/security/SecurityFactory.java
+++ b/framework/security/src/main/java/org/apache/ofbiz/security/SecurityFactory.java
@@ -25,7 +25,7 @@
import java.util.Map;
import java.util.ServiceLoader;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
import org.apache.ofbiz.base.util.Assert;
import org.apache.ofbiz.base.util.Debug;
diff --git a/framework/security/src/test/java/org/apache/ofbiz/security/CsrfUtilTests.java b/framework/security/src/test/java/org/apache/ofbiz/security/CsrfUtilTests.java
index 2bfa1669564..2e124afb0e7 100644
--- a/framework/security/src/test/java/org/apache/ofbiz/security/CsrfUtilTests.java
+++ b/framework/security/src/test/java/org/apache/ofbiz/security/CsrfUtilTests.java
@@ -28,8 +28,8 @@
import java.util.LinkedHashMap;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java
index ec19d1f788b..3b2fe3acdf4 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java
@@ -26,7 +26,7 @@
import java.util.Map;
import java.util.TimeZone;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilDateTime;
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/HttpEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/HttpEngine.java
index 0f92efbdcc4..e9d6db74209 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/HttpEngine.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/HttpEngine.java
@@ -23,8 +23,8 @@
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.HttpClient;
diff --git a/framework/start/src/main/resources/org/apache/ofbiz/base/start/start.properties b/framework/start/src/main/resources/org/apache/ofbiz/base/start/start.properties
index 8d3db5c73da..2be2171c460 100644
--- a/framework/start/src/main/resources/org/apache/ofbiz/base/start/start.properties
+++ b/framework/start/src/main/resources/org/apache/ofbiz/base/start/start.properties
@@ -59,7 +59,7 @@ ofbiz.admin.key=so3du5kasd5dn
# -- ofbiz.locale.default was used in old days where you had to set the user.language system property manually from CLI when launching OFBiz to set the default language.
# -- This is no longer true for a while. The language used by default is taken from the browser*:
# -- This is done by UtilHttp::getLocale which ultimately uses:
-# -- Locale javax.servlet.ServletRequest.getLocale()
+# -- Locale jakarta.servlet.ServletRequest.getLocale()
# -- Returns the preferred Locale that the client will accept content in, based on the Accept-Language header.
# -- If the client request doesn't provide an Accept-Language header, this method returns the default locale for the server.
# -- Returns: the preferred Locale for the client
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/AfterLoginEvents.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/AfterLoginEvents.java
index 878d1f5b878..e5618b0e640 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/AfterLoginEvents.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/AfterLoginEvents.java
@@ -22,9 +22,9 @@
import java.text.SimpleDateFormat;
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.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilHttp;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/OfbizUrlBuilder.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/OfbizUrlBuilder.java
index 05c05cda404..2448540aa0f 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/OfbizUrlBuilder.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/OfbizUrlBuilder.java
@@ -21,7 +21,7 @@
import java.io.IOException;
import java.net.URL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.ofbiz.base.component.ComponentConfig.WebappInfo;
import org.apache.ofbiz.base.util.Assert;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/SeoConfigUtil.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/SeoConfigUtil.java
index ddf7e6c97cd..529579c7822 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/SeoConfigUtil.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/SeoConfigUtil.java
@@ -29,7 +29,7 @@
import java.util.Map;
import java.util.Set;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.ofbiz.base.util.Debug;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/WebAppUtil.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/WebAppUtil.java
index 80cbfe50f19..810d1755a87 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/WebAppUtil.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/WebAppUtil.java
@@ -28,8 +28,8 @@
import java.util.Objects;
import java.util.Set;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
import org.apache.ofbiz.base.component.ComponentConfig;
import org.apache.ofbiz.base.component.ComponentConfig.WebappInfo;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java
index d6a16d3856a..546762f8420 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java
@@ -35,7 +35,7 @@
import java.util.function.Function;
import java.util.stream.Collectors;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.apache.ofbiz.base.component.ComponentConfig.WebappInfo;
import org.apache.ofbiz.base.location.FlexibleLocation;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java
index ae140866d1b..39672d32568 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java
@@ -22,14 +22,14 @@
import java.security.SecureRandom;
import java.util.Enumeration;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilGenerics;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlActivationEventListener.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlActivationEventListener.java
index 5bbc5289f89..68970456f84 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlActivationEventListener.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlActivationEventListener.java
@@ -18,9 +18,9 @@
*******************************************************************************/
package org.apache.ofbiz.webapp.control;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionActivationListener;
-import javax.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionActivationListener;
+import jakarta.servlet.http.HttpSessionEvent;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilProperties;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java
index 3435e3be5a9..310fa47a3e5 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java
@@ -22,9 +22,9 @@
import java.util.Enumeration;
import java.util.Map;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSessionListener;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilDateTime;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java
index 6b0cef5f122..9f7a30ee314 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java
@@ -29,13 +29,13 @@
import java.util.Set;
import java.util.stream.Collectors;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpFilter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpFilter;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.text.StringEscapeUtils;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlServlet.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlServlet.java
index aca43e3ba64..b8ae56179cc 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlServlet.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlServlet.java
@@ -25,13 +25,13 @@
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-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.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilCodec;
@@ -52,7 +52,7 @@
import org.apache.ofbiz.webapp.stats.VisitHandler;
import org.apache.ofbiz.widget.renderer.VisualTheme;
-import freemarker.ext.servlet.ServletContextHashModel;
+import freemarker.ext.jakarta.servlet.ServletContextHashModel;
import freemarker.template.Template;
/**
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
index 0abeaeca45b..c3389144bd4 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
@@ -22,9 +22,9 @@
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
-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.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilValidate;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java
index 758ec1e571f..58710033c04 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java
@@ -23,9 +23,9 @@
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import javax.ws.rs.core.HttpHeaders;
import org.apache.ofbiz.base.util.Debug;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginCheck.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginCheck.java
index 42c7b470680..f302310c274 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginCheck.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginCheck.java
@@ -18,8 +18,8 @@
*******************************************************************************/
package org.apache.ofbiz.webapp.control;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
public interface LoginCheck {
boolean isEnabled();
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginEventListener.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginEventListener.java
index 91f878a15ad..2e82f3bfff7 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginEventListener.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginEventListener.java
@@ -19,9 +19,9 @@
package org.apache.ofbiz.webapp.control;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSessionListener;
import org.apache.ofbiz.base.util.Debug;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
index cd10879cf67..5a17e539a23 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
@@ -36,13 +36,13 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.jsp.PageContext;
import javax.transaction.Transaction;
import org.apache.http.HttpStatus;
@@ -1228,7 +1228,7 @@ public static String check509CertLogin(HttpServletRequest request, HttpServletRe
//Debug.logInfo("CN Pattern: " + cnPattern, MODULE);
if (currentUserLogin == null) {
- X509Certificate[] clientCerts = (X509Certificate[]) request.getAttribute("javax.servlet.request.X509Certificate"); // 2.2 spec
+ X509Certificate[] clientCerts = (X509Certificate[]) request.getAttribute("jakarta.servlet.request.X509Certificate"); // 2.2 spec
if (clientCerts == null) {
clientCerts = (X509Certificate[]) request.getAttribute("javax.net.ssl.peer_certificates"); // 2.1 spec
}
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ProtectViewWorker.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ProtectViewWorker.java
index 66cbdaa036b..6b540a578f8 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ProtectViewWorker.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ProtectViewWorker.java
@@ -22,9 +22,9 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-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.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilHttp;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
index 9ec279ad67d..b4d84da4869 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
@@ -38,10 +38,10 @@
import java.util.function.Predicate;
import java.util.stream.Stream;
-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.ws.rs.core.MultivaluedHashMap;
import org.apache.cxf.jaxrs.model.URITemplate;
@@ -318,7 +318,7 @@ private static String showSessionId(HttpServletRequest request) {
* @return true if the request contains some valid certificates, otherwise false.
*/
static boolean checkCertificates(HttpServletRequest request, Predicate validator) {
- return Stream.of("javax.servlet.request.X509Certificate", // 2.2 spec
+ return Stream.of("jakarta.servlet.request.X509Certificate", // 2.2 spec
"javax.net.ssl.peer_certificates") // 2.1 spec
.map(request::getAttribute)
.filter(Objects::nonNull)
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/SameSiteFilter.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/SameSiteFilter.java
index 2ca1ac2599d..093f1a1f3e6 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/SameSiteFilter.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/SameSiteFilter.java
@@ -20,18 +20,18 @@
import java.io.IOException;
import java.util.Collection;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import javax.ws.rs.core.HttpHeaders;
import org.apache.ofbiz.entity.util.EntityUtilProperties;
-public class SameSiteFilter implements javax.servlet.Filter {
+public class SameSiteFilter implements jakarta.servlet.Filter {
private static final String SAME_SITE_COOKIE_ATTRIBUTE =
EntityUtilProperties.getPropertyValueFromDelegatorName("security.properties", "SameSiteCookieAttribute", "strict", "default");
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/TokenFilter.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/TokenFilter.java
index 7dbc3e5fd55..d524d172973 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/TokenFilter.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/TokenFilter.java
@@ -30,15 +30,15 @@
import org.apache.ofbiz.service.ModelService;
import org.apache.ofbiz.webapp.WebAppUtil;
-import javax.servlet.Filter;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
import java.io.IOException;
import java.util.Locale;
import java.util.Map;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java
index 05475ea6997..a10ba9821d3 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java
@@ -32,9 +32,9 @@
import java.util.Map;
import java.util.TimeZone;
-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.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilGenerics;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/EventFactory.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/EventFactory.java
index a1f44bf400f..9d15d87a4b6 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/EventFactory.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/EventFactory.java
@@ -22,7 +22,7 @@
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.GeneralRuntimeException;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/EventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/EventHandler.java
index 9cf67fe7c8e..bb7b5a93b62 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/EventHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/EventHandler.java
@@ -18,9 +18,9 @@
*******************************************************************************/
package org.apache.ofbiz.webapp.event;
-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.ofbiz.webapp.control.ConfigXMLReader.Event;
import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/FileUploadProgressListener.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/FileUploadProgressListener.java
index 11eaff72ba0..cd8029a2048 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/FileUploadProgressListener.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/FileUploadProgressListener.java
@@ -18,9 +18,10 @@
*******************************************************************************/
package org.apache.ofbiz.webapp.event;
+import org.apache.commons.fileupload2.core.ProgressListener;
+
import java.io.Serializable;
-import org.apache.commons.fileupload.ProgressListener;
/**
* FileUploadProgressListener - Commons FileUpload progress listener
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java
index 017d5911194..e49f8b79bf5 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java
@@ -25,10 +25,10 @@
import java.util.Set;
import javax.script.ScriptContext;
-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.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.GroovyUtil;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JSONRequestBodyMapHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JSONRequestBodyMapHandler.java
index 11c4554dce5..de54e3ea058 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JSONRequestBodyMapHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JSONRequestBodyMapHandler.java
@@ -21,7 +21,7 @@
import java.io.IOException;
import java.util.Map;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
import org.apache.ofbiz.base.lang.JSON;
import org.apache.ofbiz.base.util.UtilGenerics;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JavaEventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JavaEventHandler.java
index f11f3fbb2c8..a101770d769 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JavaEventHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JavaEventHandler.java
@@ -21,9 +21,9 @@
import java.lang.reflect.Method;
import java.util.concurrent.ConcurrentHashMap;
-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.ofbiz.base.util.Debug;
import org.apache.ofbiz.entity.transaction.GenericTransactionException;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandler.java
index c08e321d7b9..c383f17e59f 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandler.java
@@ -21,7 +21,7 @@
import java.io.IOException;
import java.util.Map;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
/** An handler that can extract a Map (typically used as a service input map) from the data in the body of a ServletRequest. */
public interface RequestBodyMapHandler {
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandlerFactory.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandlerFactory.java
index f73261ccd1d..2377f0ef919 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandlerFactory.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandlerFactory.java
@@ -22,7 +22,7 @@
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
/** Factory class that provides the proper RequestBodyMapHandler based on the content type of the ServletRequest */
public class RequestBodyMapHandlerFactory {
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java
index 49083e0fd78..27437d5ad75 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java
@@ -21,9 +21,9 @@ Licensed to the Apache Software Foundation (ASF) under one
import java.io.IOException;
-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.ofbiz.webapp.control.ConfigXMLReader.Event;
import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java
index 1716340bfe4..df1abb108b2 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java
@@ -27,9 +27,9 @@
import java.util.List;
import java.util.Map;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import javax.wsdl.WSDLException;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ScriptEventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ScriptEventHandler.java
index 81885362316..6c1483ea11e 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ScriptEventHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ScriptEventHandler.java
@@ -25,10 +25,10 @@
import java.util.Set;
import javax.script.ScriptContext;
-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.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.ScriptUtil;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java
index 240e84f11f4..f3c9bbc164d 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java
@@ -25,10 +25,10 @@
import java.util.Map;
import java.util.TimeZone;
-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.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilGenerics;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java
index ca0298a39cc..2f5fcf72dc4 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java
@@ -26,10 +26,10 @@
import java.util.Map;
import java.util.TimeZone;
-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.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilGenerics;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SimpleEventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SimpleEventHandler.java
index 1d116c2e92a..c366a6896e7 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SimpleEventHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SimpleEventHandler.java
@@ -20,9 +20,9 @@
import java.util.Locale;
-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.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilHttp;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/TestEvent.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/TestEvent.java
index 5d7cbd0eb12..8fbd4997a65 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/TestEvent.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/TestEvent.java
@@ -18,8 +18,8 @@
*******************************************************************************/
package org.apache.ofbiz.webapp.event;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.HttpClient;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenAjaxTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenAjaxTransform.java
index fa25a672e0f..ad9306156be 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenAjaxTransform.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenAjaxTransform.java
@@ -22,7 +22,7 @@
import java.io.Writer;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.ofbiz.security.CsrfUtil;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenPairNonAjaxTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenPairNonAjaxTransform.java
index 47f3de1c3a8..6f473e62c46 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenPairNonAjaxTransform.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenPairNonAjaxTransform.java
@@ -22,7 +22,7 @@
import java.io.Writer;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.ofbiz.security.CsrfUtil;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java
index 05df6ea933d..50d6cd62fd2 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java
@@ -21,10 +21,10 @@
import java.io.IOException;
import java.util.Map;
-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.ofbiz.base.util.UtilHttp;
import org.apache.ofbiz.base.util.UtilValidate;
@@ -35,9 +35,9 @@
import org.apache.ofbiz.webapp.view.AbstractViewHandler;
import org.apache.ofbiz.webapp.view.ViewHandlerException;
-import freemarker.ext.jsp.TaglibFactory;
-import freemarker.ext.servlet.HttpRequestHashModel;
-import freemarker.ext.servlet.HttpSessionHashModel;
+import freemarker.ext.jakarta.jsp.TaglibFactory;
+import freemarker.ext.jakarta.servlet.HttpRequestHashModel;
+import freemarker.ext.jakarta.servlet.HttpSessionHashModel;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/JsLanguageFilesMappingTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/JsLanguageFilesMappingTransform.java
index d3d2a25d479..d69220921f0 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/JsLanguageFilesMappingTransform.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/JsLanguageFilesMappingTransform.java
@@ -22,7 +22,7 @@
import java.io.Writer;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilHttp;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizContentTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizContentTransform.java
index 08f4bdc5975..4b23970a2a2 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizContentTransform.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizContentTransform.java
@@ -22,7 +22,7 @@
import java.io.Writer;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilCodec;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCurrencyTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCurrencyTransform.java
index 18f5e0e9443..480555cd9cb 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCurrencyTransform.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCurrencyTransform.java
@@ -24,7 +24,7 @@
import java.util.Locale;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilFormatOut;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizNumberTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizNumberTransform.java
index acf06807d4b..38372e435cc 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizNumberTransform.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizNumberTransform.java
@@ -30,7 +30,7 @@
import java.io.Writer;
import java.util.Locale;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilFormatOut;
import org.apache.ofbiz.base.util.UtilGenerics;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizScreenTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizScreenTransform.java
index caa1af2e49e..9bc0f335a5b 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizScreenTransform.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizScreenTransform.java
@@ -23,7 +23,7 @@
import java.io.Writer;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.ofbiz.base.util.Debug;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java
index 829a7392efc..8fc4eb0cc18 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java
@@ -23,8 +23,8 @@
import java.net.URLEncoder;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ofbiz.base.component.ComponentConfig.WebappInfo;
import org.apache.ofbiz.base.util.Debug;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/ScriptTagsFooterTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/ScriptTagsFooterTransform.java
index eb3a0bef433..839ab4dc565 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/ScriptTagsFooterTransform.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/ScriptTagsFooterTransform.java
@@ -22,7 +22,7 @@
import java.io.Writer;
import java.util.Map;
import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.ofbiz.widget.model.ScriptLinkHelper;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetRequestAttributeMethod.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetRequestAttributeMethod.java
index 9d10444e888..54046dd4547 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetRequestAttributeMethod.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetRequestAttributeMethod.java
@@ -20,7 +20,7 @@
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import freemarker.core.Environment;
import freemarker.ext.beans.BeanModel;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java
index 71b339af8ea..855a06eb5e0 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java
@@ -24,7 +24,7 @@
import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.concurrent.ConcurrentMap;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilHttp;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/VisitHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/VisitHandler.java
index a6cf1f42def..c53afa45ed5 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/VisitHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/VisitHandler.java
@@ -24,10 +24,10 @@
import java.util.Locale;
import java.util.stream.Collectors;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilProperties;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/taglib/ContentUrlTag.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/taglib/ContentUrlTag.java
index 70efec17dd2..2515e82507a 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/taglib/ContentUrlTag.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/taglib/ContentUrlTag.java
@@ -20,7 +20,7 @@
import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilMisc;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java
index f46c4d58df1..186c2caefe1 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java
@@ -21,9 +21,9 @@
import java.io.IOException;
import java.util.Map;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.HttpClient;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java
index 3112f34dbdd..7c719bbbf87 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java
@@ -21,12 +21,12 @@
import java.io.IOException;
import java.util.Map;
-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.jsp.JspException;
+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.jsp.JspException;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilValidate;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewFactory.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewFactory.java
index 4001980ba86..69d208486c5 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewFactory.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewFactory.java
@@ -23,7 +23,7 @@
import java.util.Map;
import java.util.Set;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.GeneralRuntimeException;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewHandler.java
index 6c7591b0969..492d5b08ec0 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewHandler.java
@@ -19,9 +19,9 @@
package org.apache.ofbiz.webapp.view;
import java.util.Map;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ofbiz.webapp.control.ConfigXMLReader;
/**
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/RequestHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/RequestHandler.java
index 5e9fc6e8a67..7119b56e4de 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/RequestHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/RequestHandler.java
@@ -20,10 +20,10 @@
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;
@FunctionalInterface
public interface RequestHandler {
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/ResponseHelper.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/ResponseHelper.java
index d9cfbc88d89..4fad69729ef 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/ResponseHelper.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/ResponseHelper.java
@@ -22,7 +22,7 @@
import java.io.IOException;
import java.io.Writer;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilXml;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavServlet.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavServlet.java
index f187ee9d98d..4d8f41348e6 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavServlet.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavServlet.java
@@ -20,15 +20,15 @@
import java.io.IOException;
-import javax.servlet.GenericServlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.GenericServlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.entity.Delegator;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java
index 1cee7dcdcb1..9319c8d3886 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java
@@ -30,7 +30,7 @@
import java.util.Map;
import java.util.TimeZone;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.ofbiz.base.util.Debug;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java
index 80a0143449a..5a80dfc0c4c 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java
@@ -18,7 +18,7 @@
*******************************************************************************/
package org.apache.ofbiz.webapp.website;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.ofbiz.base.lang.ThreadSafe;
import org.apache.ofbiz.base.start.Start;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteWorker.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteWorker.java
index a2126f1bd4d..401a5b16e91 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteWorker.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteWorker.java
@@ -18,8 +18,8 @@
*******************************************************************************/
package org.apache.ofbiz.webapp.website;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.entity.Delegator;
diff --git a/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ControlFilterTests.java b/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ControlFilterTests.java
index 1b2a01e40b1..d1acfe9d260 100644
--- a/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ControlFilterTests.java
+++ b/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ControlFilterTests.java
@@ -24,11 +24,11 @@
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.times;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
import org.junit.Before;
import org.junit.Test;
diff --git a/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManagerTests.java b/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManagerTests.java
index 116f18f6079..7625c280ea0 100644
--- a/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManagerTests.java
+++ b/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManagerTests.java
@@ -24,8 +24,8 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
import org.apache.ofbiz.entity.GenericValue;
import org.junit.Test;
diff --git a/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/RequestHandlerTests.java b/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/RequestHandlerTests.java
index 9ba9ecab589..06d22eb764a 100644
--- a/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/RequestHandlerTests.java
+++ b/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/RequestHandlerTests.java
@@ -37,7 +37,7 @@
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.ofbiz.base.util.collections.MultivaluedMapContext;
import org.apache.ofbiz.webapp.control.ConfigXMLReader.ControllerConfig;
@@ -280,7 +280,7 @@ public void checkCertificatesFailure() {
@Test
// Check that certificates with 2.2 spec are handled correctly.
public void checkCertificates22() {
- when(req.getAttribute("javax.servlet.request.X509Certificate")).thenReturn(new X509Certificate[] {});
+ when(req.getAttribute("jakarta.servlet.request.X509Certificate")).thenReturn(new X509Certificate[] {});
assertTrue(RequestHandler.checkCertificates(req, x -> true));
assertFalse(RequestHandler.checkCertificates(req, x -> false));
}
diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/GenericWebEvent.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/GenericWebEvent.java
index 39b27fab638..7620fc17f4d 100644
--- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/GenericWebEvent.java
+++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/GenericWebEvent.java
@@ -24,8 +24,8 @@
import java.util.Locale;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilHttp;
diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java
index 1e45dfcfeed..0f60c3412e6 100644
--- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java
+++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java
@@ -24,8 +24,8 @@
import java.util.Locale;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilDateTime;
diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsDbEvents.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsDbEvents.java
index dcf92d17656..8deed436f3c 100644
--- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsDbEvents.java
+++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsDbEvents.java
@@ -24,8 +24,8 @@
import java.util.Locale;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ofbiz.base.util.UtilHttp;
import org.apache.ofbiz.base.util.UtilMisc;
diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java
index 741e17dbd28..1d3688824b7 100644
--- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java
+++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java
@@ -22,8 +22,8 @@
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ofbiz.base.container.ContainerException;
import org.apache.ofbiz.base.start.StartupCommand;
diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/print/FoPrintServerEvents.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/print/FoPrintServerEvents.java
index 350c15b309a..ab57b9ac8fe 100644
--- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/print/FoPrintServerEvents.java
+++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/print/FoPrintServerEvents.java
@@ -24,8 +24,8 @@
import java.util.Locale;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.codec.binary.Base64;
import org.apache.ofbiz.base.util.Debug;
diff --git a/framework/webtools/template/cert/ViewBrowserCerts.ftl b/framework/webtools/template/cert/ViewBrowserCerts.ftl
index 40e2055086e..79951132795 100644
--- a/framework/webtools/template/cert/ViewBrowserCerts.ftl
+++ b/framework/webtools/template/cert/ViewBrowserCerts.ftl
@@ -18,7 +18,7 @@ under the License.
-->
<#assign isSecure = request.isSecure()/>
-<#assign clientCerts = request.getAttribute("javax.servlet.request.X509Certificate")!/>
+<#assign clientCerts = request.getAttribute("jakarta.servlet.request.X509Certificate")!/>
<#if (!clientCerts?has_content)>
<#assign clientCerts = request.getAttribute("javax.net.ssl.peer_certificates")!/>
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetWorker.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetWorker.java
index e5ef25e3e08..43cd182bd99 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetWorker.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetWorker.java
@@ -20,9 +20,9 @@
import java.util.Map;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.http.client.utils.URIBuilder;
import org.apache.ofbiz.base.util.Debug;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/WidgetContextCacheKey.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/WidgetContextCacheKey.java
index a9bd5c1159d..1e156571244 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/WidgetContextCacheKey.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/WidgetContextCacheKey.java
@@ -149,7 +149,7 @@ public static String printMap(Map map) {
Map printableMap = new HashMap<>();
for (Map.Entry entry : map.entrySet()) {
String fieldName = entry.getKey();
- if (!fieldNamesToSkip.contains(fieldName) && !fieldName.startsWith("javax.servlet")
+ if (!fieldNamesToSkip.contains(fieldName) && !fieldName.startsWith("jakarta.servlet")
&& !fieldName.startsWith("org.apache") && !fieldName.startsWith("_CLIENT_")) {
printableMap.put(fieldName, entry.getValue());
}
@@ -165,7 +165,7 @@ public static boolean parametersAreEqual(Map map1, Map
if (fieldNamesToSkip.contains(fieldName)) {
continue;
}
- if (fieldName.startsWith("javax.servlet") || fieldName.startsWith("org.apache") || fieldName.startsWith("_CLIENT_")) {
+ if (fieldName.startsWith("jakarta.servlet") || fieldName.startsWith("org.apache") || fieldName.startsWith("_CLIENT_")) {
continue;
}
Object field1 = map1.get(fieldName);
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/content/StaticContentUrlProvider.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/content/StaticContentUrlProvider.java
index 213b10f8309..ae440df8ae7 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/content/StaticContentUrlProvider.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/content/StaticContentUrlProvider.java
@@ -20,7 +20,7 @@
import org.apache.ofbiz.webapp.taglib.ContentUrlTag;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* Generates URL strings for addressing static content based properties configured on an HttpRequest's website or
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelAction.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelAction.java
index a86c4056db8..c4e951623c5 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelAction.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelAction.java
@@ -29,8 +29,8 @@
import java.util.Map;
import java.util.TimeZone;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.GeneralException;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FormFactory.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FormFactory.java
index b129107712a..2a7e8f351ae 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FormFactory.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FormFactory.java
@@ -24,7 +24,7 @@
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.ofbiz.base.location.FlexibleLocation;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/GridFactory.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/GridFactory.java
index 71875932eff..c8a8e86c047 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/GridFactory.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/GridFactory.java
@@ -24,8 +24,8 @@
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 javax.xml.parsers.ParserConfigurationException;
import org.apache.ofbiz.base.location.FlexibleLocation;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
index f011f299049..adb6a917a61 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
@@ -28,7 +28,7 @@
import java.util.Map;
import java.util.Stack;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.GeneralException;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java
index 5fd69f8db79..869f4248dba 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java
@@ -28,8 +28,8 @@
import java.util.Map;
import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.GeneralException;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MenuFactory.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MenuFactory.java
index 5f9ada6b691..e960ef8f854 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MenuFactory.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MenuFactory.java
@@ -23,8 +23,8 @@
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.ofbiz.base.location.FlexibleLocation;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuAction.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuAction.java
index 45030a6f746..44d23a2fef5 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuAction.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuAction.java
@@ -27,8 +27,8 @@
import java.util.Map;
import java.util.TimeZone;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.GeneralException;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTree.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTree.java
index be72c0ad9d2..d3a2d26a9fd 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTree.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTree.java
@@ -28,7 +28,7 @@
import java.util.ListIterator;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.ofbiz.base.util.Debug;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScreenFactory.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScreenFactory.java
index 549075c9263..31bfc7f1887 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScreenFactory.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScreenFactory.java
@@ -24,8 +24,8 @@
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 javax.xml.parsers.ParserConfigurationException;
import org.apache.ofbiz.base.location.FlexibleLocation;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScriptLinkHelper.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScriptLinkHelper.java
index ffd59587e95..063ddb3ec77 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScriptLinkHelper.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScriptLinkHelper.java
@@ -22,8 +22,8 @@
import org.apache.ofbiz.security.CsrfUtil;
import org.apache.ofbiz.webapp.SeoConfigUtil;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ThemeFactory.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ThemeFactory.java
index 18913504678..9f6764b923d 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ThemeFactory.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ThemeFactory.java
@@ -25,9 +25,9 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.ofbiz.base.location.FlexibleLocation;
import org.apache.ofbiz.base.util.Debug;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java
index ba4391a0c15..393e65d3504 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java
@@ -39,7 +39,7 @@
import java.util.stream.Collector;
import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilGenerics;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/MenuWrapTransform.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/MenuWrapTransform.java
index 3afe7f60d3e..03f8c6c7190 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/MenuWrapTransform.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/MenuWrapTransform.java
@@ -24,9 +24,9 @@
import java.util.List;
import java.util.Map;
-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.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.GeneralException;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/ScreenRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/ScreenRenderer.java
index 26d3334545f..72bf8bf2d45 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/ScreenRenderer.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/ScreenRenderer.java
@@ -29,10 +29,10 @@
import java.util.Stack;
import java.util.UUID;
-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.xml.parsers.ParserConfigurationException;
import org.apache.ofbiz.base.util.Debug;
@@ -66,10 +66,10 @@
import org.apache.ofbiz.widget.model.ThemeFactory;
import org.xml.sax.SAXException;
-import freemarker.ext.jsp.TaglibFactory;
-import freemarker.ext.servlet.HttpRequestHashModel;
-import freemarker.ext.servlet.HttpSessionHashModel;
-import freemarker.ext.servlet.ServletContextHashModel;
+import freemarker.ext.jakarta.jsp.TaglibFactory;
+import freemarker.ext.jakarta.servlet.HttpRequestHashModel;
+import freemarker.ext.jakarta.servlet.HttpSessionHashModel;
+import freemarker.ext.jakarta.servlet.ServletContextHashModel;
/**
* Widget Library - Screen model class
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/fo/FoFormRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/fo/FoFormRenderer.java
index 37ad1fd357a..95418f73373 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/fo/FoFormRenderer.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/fo/FoFormRenderer.java
@@ -22,8 +22,8 @@
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ofbiz.base.util.UtilFormatOut;
import org.apache.ofbiz.base.util.UtilValidate;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/fo/ScreenFopViewHandler.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/fo/ScreenFopViewHandler.java
index 85bd934bbdc..fdf31608703 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/fo/ScreenFopViewHandler.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/fo/ScreenFopViewHandler.java
@@ -26,9 +26,9 @@
import java.io.Writer;
import java.util.Map;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.stream.StreamSource;
@@ -69,7 +69,7 @@ public class ScreenFopViewHandler extends AbstractViewHandler {
private ServletContext servletContext = null;
/**
- * @see org.apache.ofbiz.webapp.view.ViewHandler#init(javax.servlet.ServletContext)
+ * @see org.apache.ofbiz.webapp.view.ViewHandler#init(jakarta.servlet.ServletContext)
*/
@Override
public void init(ServletContext context) throws ViewHandlerException {
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuRenderer.java
index 9b7046d3458..81065265f5e 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuRenderer.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuRenderer.java
@@ -24,10 +24,10 @@
import java.util.List;
import java.util.Map;
-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.ofbiz.base.util.StringUtil;
import org.apache.ofbiz.base.util.UtilCodec;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuRendererImage.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuRendererImage.java
index 4cb26f62911..dbe3ffa1cc8 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuRendererImage.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuRendererImage.java
@@ -22,8 +22,8 @@
import java.io.StringWriter;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilValidate;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapper.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapper.java
index a0bfc394f56..44d82aa04e8 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapper.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapper.java
@@ -24,9 +24,9 @@
import java.util.HashMap;
import java.util.Map;
-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 javax.xml.parsers.ParserConfigurationException;
import org.apache.ofbiz.base.util.Debug;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapperImage.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapperImage.java
index c13614b2c91..a7fce15402a 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapperImage.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapperImage.java
@@ -22,8 +22,8 @@
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.ofbiz.entity.Delegator;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java
index b6645c8d6ab..cd9910a0428 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java
@@ -23,8 +23,8 @@
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.StringUtil;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroCommonRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroCommonRenderer.java
index d54aea08d7f..252f0795382 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroCommonRenderer.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroCommonRenderer.java
@@ -25,8 +25,8 @@
import java.util.Map;
import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ofbiz.base.util.UtilGenerics;
import org.apache.ofbiz.base.util.UtilHttp;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
index c7d13be3536..4380d0a9a7a 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
@@ -33,9 +33,9 @@
import java.util.UUID;
import java.util.stream.Collectors;
-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.text.StringEscapeUtils;
import org.apache.ofbiz.base.util.Debug;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java
index c989c32819a..21afc6f0d5f 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java
@@ -28,8 +28,8 @@
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.StringUtil;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java
index 0eb198c3dba..a5893639f37 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java
@@ -30,8 +30,8 @@
import java.util.Map;
import java.util.WeakHashMap;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.ofbiz.base.util.Debug;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java
index 19350f69386..e7d8fffde51 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java
@@ -22,9 +22,9 @@
import java.io.Writer;
import java.util.Map;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.ofbiz.base.util.Debug;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java
index 49edbc32b46..bed80e2e176 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java
@@ -26,8 +26,8 @@
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.StringUtil;
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/RenderableFtlFormElementsBuilder.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/RenderableFtlFormElementsBuilder.java
index 413132c09f3..21e02e46cbd 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/RenderableFtlFormElementsBuilder.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/RenderableFtlFormElementsBuilder.java
@@ -34,9 +34,9 @@
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-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 com.ibm.icu.util.Calendar;
import org.apache.ofbiz.base.util.Debug;
diff --git a/framework/widget/src/test/java/org/apache/ofbiz/widget/WidgetWorkerTest.java b/framework/widget/src/test/java/org/apache/ofbiz/widget/WidgetWorkerTest.java
index 29e4bba92f2..3b181b18b4d 100644
--- a/framework/widget/src/test/java/org/apache/ofbiz/widget/WidgetWorkerTest.java
+++ b/framework/widget/src/test/java/org/apache/ofbiz/widget/WidgetWorkerTest.java
@@ -24,7 +24,7 @@
import org.junit.Before;
import org.junit.Test;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.net.URI;
import java.util.HashMap;
diff --git a/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRendererTest.java b/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRendererTest.java
index 3964d961ce6..4488043662d 100644
--- a/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRendererTest.java
+++ b/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRendererTest.java
@@ -34,9 +34,9 @@
import java.util.Map;
import java.util.stream.Collectors;
-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.ofbiz.base.util.UtilCodec.SimpleEncoder;
import org.apache.ofbiz.base.util.UtilHttp;
diff --git a/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/RenderableFtlFormElementsBuilderDatetimeTest.java b/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/RenderableFtlFormElementsBuilderDatetimeTest.java
index 9b7309a5e31..98fa4b1e137 100644
--- a/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/RenderableFtlFormElementsBuilderDatetimeTest.java
+++ b/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/RenderableFtlFormElementsBuilderDatetimeTest.java
@@ -22,9 +22,9 @@
import java.util.HashMap;
-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.ofbiz.webapp.control.RequestHandler;
import org.apache.ofbiz.widget.content.StaticContentUrlProvider;
diff --git a/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/RenderableFtlFormElementsBuilderTest.java b/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/RenderableFtlFormElementsBuilderTest.java
index c31b0a966d2..eac0b1c8982 100644
--- a/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/RenderableFtlFormElementsBuilderTest.java
+++ b/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/RenderableFtlFormElementsBuilderTest.java
@@ -37,9 +37,9 @@
import org.apache.ofbiz.widget.renderer.macro.renderable.RenderableFtlNoop;
import org.junit.Test;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
import java.util.HashMap;
import java.util.List;
import java.util.Map;