You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ol...@apache.org on 2020/04/10 09:57:25 UTC
[tomcat-taglibs-standard] branch master updated: move from javax to
jakarta namespace
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-standard.git
The following commit(s) were added to refs/heads/master by this push:
new b283d88 move from javax to jakarta namespace
b283d88 is described below
commit b283d88bd9d396a35815a90e7af65c04024a4df0
Author: olivier lamy <ol...@apache.org>
AuthorDate: Fri Apr 10 19:57:06 2020 +1000
move from javax to jakarta namespace
Signed-off-by: olivier lamy <ol...@apache.org>
---
compat/pom.xml | 12 ++---
.../standard/tag/compat/core/ForEachTag.java | 4 +-
.../standard/tag/compat/core/ForTokensTag.java | 4 +-
.../taglibs/standard/tag/compat/core/IfTag.java | 6 +--
.../standard/tag/compat/core/ImportTag.java | 4 +-
.../taglibs/standard/tag/compat/core/OutTag.java | 4 +-
.../taglibs/standard/tag/compat/core/ParamTag.java | 4 +-
.../standard/tag/compat/core/RedirectTag.java | 4 +-
.../taglibs/standard/tag/compat/core/SetTag.java | 4 +-
.../taglibs/standard/tag/compat/core/UrlTag.java | 4 +-
.../taglibs/standard/tag/compat/core/WhenTag.java | 4 +-
.../taglibs/standard/tag/compat/fmt/BundleTag.java | 4 +-
.../standard/tag/compat/fmt/FormatDateTag.java | 4 +-
.../standard/tag/compat/fmt/FormatNumberTag.java | 4 +-
.../standard/tag/compat/fmt/MessageTag.java | 6 +--
.../taglibs/standard/tag/compat/fmt/ParamTag.java | 4 +-
.../standard/tag/compat/fmt/ParseDateTag.java | 4 +-
.../standard/tag/compat/fmt/ParseNumberTag.java | 4 +-
.../tag/compat/fmt/RequestEncodingTag.java | 4 +-
.../standard/tag/compat/fmt/SetBundleTag.java | 4 +-
.../standard/tag/compat/fmt/SetLocaleTag.java | 4 +-
.../standard/tag/compat/fmt/SetTimeZoneTag.java | 4 +-
.../standard/tag/compat/fmt/TimeZoneTag.java | 4 +-
.../standard/tag/compat/sql/DateParamTag.java | 4 +-
.../taglibs/standard/tag/compat/sql/ParamTag.java | 4 +-
.../taglibs/standard/tag/compat/sql/QueryTag.java | 4 +-
.../standard/tag/compat/sql/SetDataSourceTag.java | 4 +-
.../standard/tag/compat/sql/TransactionTag.java | 4 +-
.../taglibs/standard/tag/compat/sql/UpdateTag.java | 4 +-
.../taglibs/standard/tag/compat/xml/ExprTag.java | 4 +-
.../taglibs/standard/tag/compat/xml/ParamTag.java | 4 +-
.../taglibs/standard/tag/compat/xml/ParseTag.java | 4 +-
.../standard/tag/compat/xml/TransformTag.java | 4 +-
impl/pom.xml | 12 ++---
.../taglibs/standard/functions/Functions.java | 2 +-
.../taglibs/standard/tag/common/core/CatchTag.java | 6 +--
.../standard/tag/common/core/ChooseTag.java | 4 +-
.../standard/tag/common/core/DeclareTag.java | 2 +-
.../standard/tag/common/core/ForEachSupport.java | 16 +++----
.../standard/tag/common/core/ForTokensSupport.java | 12 ++---
.../standard/tag/common/core/ImportSupport.java | 54 +++++++++++++++-------
.../tag/common/core/NullAttributeException.java | 2 +-
.../standard/tag/common/core/OutSupport.java | 6 +--
.../standard/tag/common/core/ParamSupport.java | 8 ++--
.../standard/tag/common/core/RedirectSupport.java | 10 ++--
.../standard/tag/common/core/RemoveTag.java | 6 +--
.../standard/tag/common/core/SetSupport.java | 22 ++++-----
.../standard/tag/common/core/UrlSupport.java | 12 ++---
.../taglibs/standard/tag/common/core/Util.java | 6 +--
.../standard/tag/common/core/WhenTagSupport.java | 8 ++--
.../standard/tag/common/fmt/BundleSupport.java | 16 +++----
.../standard/tag/common/fmt/FormatDateSupport.java | 8 ++--
.../tag/common/fmt/FormatNumberSupport.java | 8 ++--
.../standard/tag/common/fmt/MessageSupport.java | 12 ++---
.../standard/tag/common/fmt/ParamSupport.java | 8 ++--
.../standard/tag/common/fmt/ParseDateSupport.java | 8 ++--
.../tag/common/fmt/ParseNumberSupport.java | 8 ++--
.../tag/common/fmt/RequestEncodingSupport.java | 10 ++--
.../standard/tag/common/fmt/SetBundleSupport.java | 10 ++--
.../standard/tag/common/fmt/SetLocaleSupport.java | 18 ++++----
.../tag/common/fmt/SetTimeZoneSupport.java | 8 ++--
.../standard/tag/common/fmt/TimeZoneSupport.java | 14 +++---
.../standard/tag/common/sql/DataSourceUtil.java | 8 ++--
.../tag/common/sql/DateParamTagSupport.java | 8 ++--
.../standard/tag/common/sql/ParamTagSupport.java | 8 ++--
.../standard/tag/common/sql/QueryTagSupport.java | 18 ++++----
.../standard/tag/common/sql/ResultImpl.java | 4 +-
.../tag/common/sql/SetDataSourceTagSupport.java | 10 ++--
.../tag/common/sql/TransactionTagSupport.java | 8 ++--
.../standard/tag/common/sql/UpdateTagSupport.java | 14 +++---
.../standard/tag/common/xml/ExprSupport.java | 6 +--
.../standard/tag/common/xml/ForEachTag.java | 8 ++--
.../taglibs/standard/tag/common/xml/IfTag.java | 4 +-
.../standard/tag/common/xml/JSTLVariableStack.java | 6 +--
.../standard/tag/common/xml/ParamSupport.java | 8 ++--
.../standard/tag/common/xml/ParseSupport.java | 8 ++--
.../taglibs/standard/tag/common/xml/SetTag.java | 8 ++--
.../standard/tag/common/xml/TransformSupport.java | 8 ++--
.../taglibs/standard/tag/common/xml/WhenTag.java | 2 +-
.../taglibs/standard/tag/common/xml/XalanUtil.java | 6 +--
.../taglibs/standard/tag/rt/core/ForEachTag.java | 6 +--
.../taglibs/standard/tag/rt/core/ForTokensTag.java | 6 +--
.../apache/taglibs/standard/tag/rt/core/IfTag.java | 2 +-
.../taglibs/standard/tag/rt/core/ImportTag.java | 2 +-
.../taglibs/standard/tag/rt/core/ParamTag.java | 2 +-
.../taglibs/standard/tag/rt/core/RedirectTag.java | 2 +-
.../taglibs/standard/tag/rt/core/UrlTag.java | 2 +-
.../taglibs/standard/tag/rt/fmt/BundleTag.java | 2 +-
.../taglibs/standard/tag/rt/fmt/FormatDateTag.java | 2 +-
.../standard/tag/rt/fmt/FormatNumberTag.java | 2 +-
.../taglibs/standard/tag/rt/fmt/MessageTag.java | 4 +-
.../taglibs/standard/tag/rt/fmt/ParamTag.java | 2 +-
.../taglibs/standard/tag/rt/fmt/ParseDateTag.java | 2 +-
.../standard/tag/rt/fmt/ParseNumberTag.java | 2 +-
.../standard/tag/rt/fmt/RequestEncodingTag.java | 2 +-
.../taglibs/standard/tag/rt/fmt/SetBundleTag.java | 2 +-
.../taglibs/standard/tag/rt/fmt/SetLocaleTag.java | 2 +-
.../standard/tag/rt/fmt/SetTimeZoneTag.java | 2 +-
.../taglibs/standard/tag/rt/fmt/TimeZoneTag.java | 2 +-
.../standard/tag/rt/sql/TransactionTag.java | 2 +-
.../taglibs/standard/tag/rt/xml/ParamTag.java | 2 +-
.../taglibs/standard/tag/rt/xml/ParseTag.java | 2 +-
.../taglibs/standard/tag/rt/xml/TransformTag.java | 2 +-
.../apache/taglibs/standard/tei/DeclareTEI.java | 6 +--
.../apache/taglibs/standard/tei/ForEachTEI.java | 4 +-
.../org/apache/taglibs/standard/tei/ImportTEI.java | 4 +-
.../java/org/apache/taglibs/standard/tei/Util.java | 2 +-
.../apache/taglibs/standard/tei/XmlParseTEI.java | 4 +-
.../taglibs/standard/tei/XmlTransformTEI.java | 4 +-
.../apache/taglibs/standard/tlv/JstlBaseTLV.java | 8 ++--
.../apache/taglibs/standard/tlv/JstlCoreTLV.java | 4 +-
.../apache/taglibs/standard/tlv/JstlFmtTLV.java | 4 +-
.../apache/taglibs/standard/tlv/JstlSqlTLV.java | 4 +-
.../apache/taglibs/standard/tlv/JstlXmlTLV.java | 4 +-
.../apache/taglibs/standard/util/EscapeXML.java | 2 +-
.../taglibs/standard/util/ExpressionUtil.java | 10 ++--
.../org/apache/taglibs/standard/util/XmlUtil.java | 4 +-
.../taglibs/standard/functions/FunctionsTest.java | 2 +-
.../standard/tag/common/core/SetSupportTest.java | 20 ++++----
.../standard/tag/common/fmt/BundleSupportTest.java | 2 +-
.../standard/tag/common/xml/ExprSupportTest.java | 4 +-
.../standard/tag/common/xml/ForEachTagTest.java | 4 +-
.../tag/common/xml/JSTLVariableStackTest.java | 8 ++--
.../tag/common/xml/TransformSupportTest.java | 2 +-
.../standard/tag/common/xml/XalanUtilTest.java | 4 +-
.../taglibs/standard/util/EscapeXMLTest.java | 2 +-
jstlel/pom.xml | 12 ++---
.../taglibs/standard/lang/jstl/ELEvaluator.java | 2 +-
.../taglibs/standard/lang/jstl/Evaluator.java | 6 +--
.../standard/lang/jstl/ImplicitObjects.java | 8 ++--
.../standard/lang/jstl/JSTLVariableResolver.java | 2 +-
.../standard/lang/jstl/parser/ELParser.java | 2 +-
.../standard/lang/support/ExpressionEvaluator.java | 6 +--
.../lang/support/ExpressionEvaluatorManager.java | 6 +--
.../standard/tag/el/core/ExpressionUtil.java | 6 +--
.../taglibs/standard/tag/el/core/ForEachTag.java | 6 +--
.../taglibs/standard/tag/el/core/ForTokensTag.java | 6 +--
.../apache/taglibs/standard/tag/el/core/IfTag.java | 6 +--
.../taglibs/standard/tag/el/core/ImportTag.java | 2 +-
.../taglibs/standard/tag/el/core/OutTag.java | 2 +-
.../taglibs/standard/tag/el/core/ParamTag.java | 2 +-
.../taglibs/standard/tag/el/core/RedirectTag.java | 2 +-
.../taglibs/standard/tag/el/core/SetTag.java | 2 +-
.../taglibs/standard/tag/el/core/UrlTag.java | 2 +-
.../taglibs/standard/tag/el/core/WhenTag.java | 4 +-
.../taglibs/standard/tag/el/fmt/BundleTag.java | 2 +-
.../taglibs/standard/tag/el/fmt/FormatDateTag.java | 2 +-
.../standard/tag/el/fmt/FormatNumberTag.java | 2 +-
.../taglibs/standard/tag/el/fmt/MessageTag.java | 4 +-
.../taglibs/standard/tag/el/fmt/ParamTag.java | 2 +-
.../taglibs/standard/tag/el/fmt/ParseDateTag.java | 2 +-
.../standard/tag/el/fmt/ParseNumberTag.java | 2 +-
.../standard/tag/el/fmt/RequestEncodingTag.java | 2 +-
.../taglibs/standard/tag/el/fmt/SetBundleTag.java | 2 +-
.../taglibs/standard/tag/el/fmt/SetLocaleTag.java | 2 +-
.../standard/tag/el/fmt/SetTimeZoneTag.java | 2 +-
.../taglibs/standard/tag/el/fmt/TimeZoneTag.java | 2 +-
.../taglibs/standard/tag/el/sql/DateParamTag.java | 2 +-
.../taglibs/standard/tag/el/sql/ParamTag.java | 2 +-
.../taglibs/standard/tag/el/sql/QueryTag.java | 2 +-
.../standard/tag/el/sql/SetDataSourceTag.java | 2 +-
.../standard/tag/el/sql/TransactionTag.java | 2 +-
.../taglibs/standard/tag/el/sql/UpdateTag.java | 2 +-
.../taglibs/standard/tag/el/xml/ExprTag.java | 2 +-
.../taglibs/standard/tag/el/xml/ParamTag.java | 2 +-
.../taglibs/standard/tag/el/xml/ParseTag.java | 2 +-
.../taglibs/standard/tag/el/xml/TransformTag.java | 2 +-
.../standard/lang/jstl/test/EvaluationTest.java | 4 +-
.../standard/lang/jstl/test/PageContextImpl.java | 22 ++++-----
.../standard/lang/jstl/test/ParserTest.java | 6 +--
.../lang/jstl/test/StaticFunctionTest.java | 2 +-
pom.xml | 42 +++++++++++++----
spec/pom.xml | 12 ++---
.../jsp/jstl/core/ConditionalTagSupport.java | 10 ++--
.../servlet/jsp/jstl/core/Config.java | 22 ++++-----
.../jsp/jstl/core/IndexedValueExpression.java | 6 +--
.../servlet/jsp/jstl/core/IteratedExpression.java | 8 ++--
.../jsp/jstl/core/IteratedValueExpression.java | 6 +--
.../servlet/jsp/jstl/core/LoopTag.java | 8 ++--
.../servlet/jsp/jstl/core/LoopTagStatus.java | 2 +-
.../servlet/jsp/jstl/core/LoopTagSupport.java | 28 +++++------
.../servlet/jsp/jstl/fmt/JakartaInline.java | 18 ++++----
.../servlet/jsp/jstl/fmt/LocaleSupport.java | 10 ++--
.../servlet/jsp/jstl/fmt/LocalizationContext.java | 2 +-
.../servlet/jsp/jstl/sql/Result.java | 2 +-
.../servlet/jsp/jstl/sql/ResultImpl.java | 2 +-
.../servlet/jsp/jstl/sql/ResultSupport.java | 4 +-
.../servlet/jsp/jstl/sql/SQLExecutionTag.java | 2 +-
.../servlet/jsp/jstl/tlv/PageParser.java | 4 +-
.../servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java | 8 ++--
.../servlet/jsp/jstl/tlv/ScriptFreeTLV.java | 8 ++--
.../jsp/jstl/tlv/PermittedTaglibsTLVTest.java | 6 +--
standard-examples/pom.xml | 12 ++---
.../taglibs/standard/examples/startup/Init.java | 4 +-
.../standard/examples/taglib/CustomerFmtTag.java | 6 +--
.../standard/examples/taglib/DefaultLocaleTag.java | 4 +-
.../standard/examples/taglib/EscapeHtmlTag.java | 6 +--
.../taglibs/standard/examples/taglib/EvenTag.java | 8 ++--
.../taglibs/standard/examples/taglib/FileTag.java | 4 +-
.../standard/examples/taglib/Functions.java | 2 +-
.../standard/examples/taglib/LocalesTag.java | 4 +-
.../examples/taglib/NullAttributeException.java | 2 +-
.../taglibs/standard/examples/taglib/OddTag.java | 8 ++--
.../standard/examples/taglib/ResourceTag.java | 12 ++---
.../standard/examples/taglib/UsCustomerTag.java | 6 +--
.../taglibs/standard/examples/util/IOBean.java | 2 +-
.../util/ServletResponseWrapperForWriter.java | 6 +--
.../taglibs/standard/examples/util/Util.java | 2 +-
standard-test/pom.xml | 14 +++---
.../taglibs/standard/functions/TestEndsWith.java | 2 +-
.../taglibs/standard/tag/el/core/Test34109.java | 2 +-
.../taglibs/standard/tag/el/core/Test37466.java | 2 +-
.../taglibs/standard/tag/el/core/TestOutTag.java | 2 +-
.../taglibs/standard/tag/el/core/TestSetTag.java | 2 +-
.../taglibs/standard/tag/el/fmt/TestDateTag.java | 2 +-
.../taglibs/standard/tag/el/sql/Test33054.java | 2 +-
.../taglibs/standard/tag/el/sql/Test43831.java | 2 +-
.../taglibs/standard/tag/el/xml/Test30068.java | 2 +-
218 files changed, 653 insertions(+), 611 deletions(-)
diff --git a/compat/pom.xml b/compat/pom.xml
index f2be169..3774922 100644
--- a/compat/pom.xml
+++ b/compat/pom.xml
@@ -49,18 +49,18 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>jakarta.servlet.jsp</groupId>
+ <artifactId>jakarta.servlet.jsp-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java
index 542093a..07dc8f2 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java
@@ -18,8 +18,8 @@ package org.apache.taglibs.standard.tag.compat.core;
import java.util.Collections;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.core.ForEachSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java
index 42cef20..e2bebca 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java
@@ -16,8 +16,8 @@
*/
package org.apache.taglibs.standard.tag.compat.core;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.core.ForTokensSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/IfTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/IfTag.java
index 3d52821..d2ff736 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/IfTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/IfTag.java
@@ -16,9 +16,9 @@
*/
package org.apache.taglibs.standard.tag.compat.core;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.jstl.core.ConditionalTagSupport;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.jstl.core.ConditionalTagSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ImportTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ImportTag.java
index 2ab0a9b..285c619 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ImportTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ImportTag.java
@@ -16,8 +16,8 @@
*/
package org.apache.taglibs.standard.tag.compat.core;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.core.ImportSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/OutTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/OutTag.java
index 103d71a..ad9149d 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/OutTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/OutTag.java
@@ -16,8 +16,8 @@
*/
package org.apache.taglibs.standard.tag.compat.core;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.core.OutSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ParamTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ParamTag.java
index 8abde2a..c5d7de6 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ParamTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ParamTag.java
@@ -16,8 +16,8 @@
*/
package org.apache.taglibs.standard.tag.compat.core;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.core.ParamSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/RedirectTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/RedirectTag.java
index 9808d36..708ab66 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/RedirectTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/RedirectTag.java
@@ -16,8 +16,8 @@
*/
package org.apache.taglibs.standard.tag.compat.core;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.core.RedirectSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/SetTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/SetTag.java
index 9ba5dcc..f65a12a 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/SetTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/SetTag.java
@@ -16,8 +16,8 @@
*/
package org.apache.taglibs.standard.tag.compat.core;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.core.SetSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/UrlTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/UrlTag.java
index e10cf5d..52bd33c 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/UrlTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/UrlTag.java
@@ -16,8 +16,8 @@
*/
package org.apache.taglibs.standard.tag.compat.core;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.core.UrlSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/WhenTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/WhenTag.java
index 1425a6b..a8e7a4b 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/WhenTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/WhenTag.java
@@ -16,8 +16,8 @@
*/
package org.apache.taglibs.standard.tag.compat.core;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspTagException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspTagException;
import org.apache.taglibs.standard.tag.common.core.WhenTagSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/BundleTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/BundleTag.java
index 0c0a730..e8dae9b 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/BundleTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/BundleTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.compat.fmt;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.fmt.BundleSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/FormatDateTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/FormatDateTag.java
index cb775f7..f3f4e4b 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/FormatDateTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/FormatDateTag.java
@@ -19,8 +19,8 @@ package org.apache.taglibs.standard.tag.compat.fmt;
import java.util.Date;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.fmt.FormatDateSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/FormatNumberTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/FormatNumberTag.java
index 0e73549..04c3745 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/FormatNumberTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/FormatNumberTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.compat.fmt;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.fmt.FormatNumberSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/MessageTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/MessageTag.java
index f6e785b..dc6fb8d 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/MessageTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/MessageTag.java
@@ -17,9 +17,9 @@
package org.apache.taglibs.standard.tag.compat.fmt;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.jstl.fmt.LocalizationContext;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.jstl.fmt.LocalizationContext;
import org.apache.taglibs.standard.tag.common.fmt.MessageSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParamTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParamTag.java
index f365622..2dbb966 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParamTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParamTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.compat.fmt;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.fmt.ParamSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseDateTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseDateTag.java
index 1ecd21c..6e1a515 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseDateTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseDateTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.compat.fmt;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.fmt.LocaleUtil;
import org.apache.taglibs.standard.tag.common.fmt.ParseDateSupport;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseNumberTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseNumberTag.java
index b058fbe..38b8161 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseNumberTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseNumberTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.compat.fmt;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.fmt.LocaleUtil;
import org.apache.taglibs.standard.tag.common.fmt.ParseNumberSupport;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/RequestEncodingTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/RequestEncodingTag.java
index eeac9b2..5fe07ca 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/RequestEncodingTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/RequestEncodingTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.compat.fmt;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.fmt.RequestEncodingSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetBundleTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetBundleTag.java
index d67b6fc..35ca19f 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetBundleTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetBundleTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.compat.fmt;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.fmt.SetBundleSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetLocaleTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetLocaleTag.java
index ca60f2b..c3e5214 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetLocaleTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetLocaleTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.compat.fmt;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.fmt.SetLocaleSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetTimeZoneTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetTimeZoneTag.java
index f9b4730..e3963f1 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetTimeZoneTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetTimeZoneTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.compat.fmt;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.fmt.SetTimeZoneSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/TimeZoneTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/TimeZoneTag.java
index e836a19..22ad2e8 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/TimeZoneTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/TimeZoneTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.compat.fmt;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.fmt.TimeZoneSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/DateParamTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/DateParamTag.java
index 2e53ea6..689a8fe 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/DateParamTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/DateParamTag.java
@@ -19,8 +19,8 @@ package org.apache.taglibs.standard.tag.compat.sql;
import java.util.Date;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.sql.DateParamTagSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/ParamTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/ParamTag.java
index 1706369..25b2953 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/ParamTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/ParamTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.compat.sql;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.sql.ParamTagSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/QueryTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/QueryTag.java
index 322a511..3416aa9 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/QueryTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/QueryTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.compat.sql;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.sql.QueryTagSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/SetDataSourceTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/SetDataSourceTag.java
index 22525bc..8718dfa 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/SetDataSourceTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/SetDataSourceTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.compat.sql;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.sql.SetDataSourceTagSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/TransactionTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/TransactionTag.java
index ea9da12..6259a8f 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/TransactionTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/TransactionTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.compat.sql;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.sql.TransactionTagSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/UpdateTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/UpdateTag.java
index bc525b5..ab71c36 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/UpdateTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/UpdateTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.compat.sql;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.sql.UpdateTagSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ExprTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ExprTag.java
index 2ba8099..55641c2 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ExprTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ExprTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.compat.xml;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.xml.ExprSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParamTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParamTag.java
index b062586..c6e23f8 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParamTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParamTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.compat.xml;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.xml.ParamSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParseTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParseTag.java
index fc59c47..f7db1ee 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParseTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParseTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.compat.xml;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.xml.ParseSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
diff --git a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/TransformTag.java b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/TransformTag.java
index f3d2319..abd36b7 100644
--- a/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/TransformTag.java
+++ b/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/TransformTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.compat.xml;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
import javax.xml.transform.Result;
import org.apache.taglibs.standard.tag.common.xml.TransformSupport;
diff --git a/impl/pom.xml b/impl/pom.xml
index 2043ea9..8e6bfa6 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -42,18 +42,18 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>jakarta.servlet.jsp</groupId>
+ <artifactId>jakarta.servlet.jsp-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/impl/src/main/java/org/apache/taglibs/standard/functions/Functions.java b/impl/src/main/java/org/apache/taglibs/standard/functions/Functions.java
index 1980e1b..2837b05 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/functions/Functions.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/functions/Functions.java
@@ -24,7 +24,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.StringTokenizer;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import org.apache.taglibs.standard.resources.Resources;
import org.apache.taglibs.standard.util.EscapeXML;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/CatchTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/CatchTag.java
index c8b55c3..91fc5ff 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/CatchTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/CatchTag.java
@@ -17,9 +17,9 @@
package org.apache.taglibs.standard.tag.common.core;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
-import javax.servlet.jsp.tagext.TryCatchFinally;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.tagext.TryCatchFinally;
/**
* <p>Tag handler for <catch> in JSTL 1.0.</p>
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ChooseTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ChooseTag.java
index 48d584b..408f418 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ChooseTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ChooseTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.common.core;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.TagSupport;
import org.apache.taglibs.standard.resources.Resources;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/DeclareTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/DeclareTag.java
index bbb9716..3cc25b4 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/DeclareTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/DeclareTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.common.core;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.tagext.TagSupport;
/**
* <p>Tag handler for <declaregt; in JSTL. This tag handler is
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java
index d468a8f..fd5edbc 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java
@@ -25,12 +25,12 @@ import java.util.Map;
import java.util.NoSuchElementException;
import java.util.StringTokenizer;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.jstl.core.IndexedValueExpression;
-import javax.servlet.jsp.jstl.core.IteratedExpression;
-import javax.servlet.jsp.jstl.core.IteratedValueExpression;
-import javax.servlet.jsp.jstl.core.LoopTagSupport;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.jstl.core.IndexedValueExpression;
+import jakarta.servlet.jsp.jstl.core.IteratedExpression;
+import jakarta.servlet.jsp.jstl.core.IteratedValueExpression;
+import jakarta.servlet.jsp.jstl.core.LoopTagSupport;
import org.apache.taglibs.standard.resources.Resources;
@@ -43,11 +43,11 @@ import org.apache.taglibs.standard.resources.Resources;
* <p>Localized here is the logic for handling the veritable smorgasbord
* of types supported by <forEach>, including arrays,
* Collections, and others. To see how the actual iteration is controlled,
- * review the javax.servlet.jsp.jstl.core.LoopTagSupport class instead.
+ * review the jakarta.servlet.jsp.jstl.core.LoopTagSupport class instead.
* </p>
*
* @author Shawn Bayern
- * @see javax.servlet.jsp.jstl.core.LoopTagSupport
+ * @see jakarta.servlet.jsp.jstl.core.LoopTagSupport
*/
public abstract class ForEachSupport extends LoopTagSupport {
protected Iterator items; // our 'digested' items
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java
index b953a7e..4b5fc46 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java
@@ -19,11 +19,11 @@ package org.apache.taglibs.standard.tag.common.core;
import java.util.StringTokenizer;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.jstl.core.IteratedExpression;
-import javax.servlet.jsp.jstl.core.IteratedValueExpression;
-import javax.servlet.jsp.jstl.core.LoopTagSupport;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.jstl.core.IteratedExpression;
+import jakarta.servlet.jsp.jstl.core.IteratedValueExpression;
+import jakarta.servlet.jsp.jstl.core.LoopTagSupport;
/**
* <p>Support for tag handlers for <forTokens>, the tokenizing
@@ -33,7 +33,7 @@ import javax.servlet.jsp.jstl.core.LoopTagSupport;
* class.</p>
*
* @author Shawn Bayern
- * @see javax.servlet.jsp.jstl.core.LoopTagSupport
+ * @see jakarta.servlet.jsp.jstl.core.LoopTagSupport
*/
public abstract class ForTokensSupport extends LoopTagSupport {
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
index cb49a8c..681fa3e 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
@@ -17,6 +17,22 @@
package org.apache.taglibs.standard.tag.common.core;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.tagext.TryCatchFinally;
+import org.apache.taglibs.standard.resources.Resources;
+import org.apache.taglibs.standard.util.UrlUtil;
+
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -32,22 +48,6 @@ import java.net.URL;
import java.net.URLConnection;
import java.util.Locale;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-import javax.servlet.jsp.tagext.TryCatchFinally;
-
-import org.apache.taglibs.standard.resources.Resources;
-import org.apache.taglibs.standard.util.UrlUtil;
-
/**
* <p>Support for tag handlers for <import>, the general-purpose
* text-importing mechanism for JSTL 1.0. The rtexprvalue and expression-
@@ -426,9 +426,29 @@ public abstract class ImportSupport extends BodyTagSupport
* A ServletOutputStream we convey, tied to this Writer.
*/
private ServletOutputStream sos = new ServletOutputStream() {
+
+ private WriteListener writeListener;
+
@Override
public void write(int b) throws IOException {
- bos.write(b);
+ try {
+ bos.write(b);
+ } catch ( Exception e ) {
+ if(this.writeListener!=null) {
+ this.writeListener.onError( e );
+ }
+ throw new IOException(e);
+ }
+ }
+
+ @Override
+ public boolean isReady() {
+ return true;
+ }
+
+ @Override
+ public void setWriteListener( WriteListener writeListener ) {
+ this.writeListener = writeListener;
}
};
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/NullAttributeException.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/NullAttributeException.java
index c4cb149..e487435 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/NullAttributeException.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/NullAttributeException.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.common.core;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import org.apache.taglibs.standard.resources.Resources;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OutSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OutSupport.java
index e394e0a..411b897 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OutSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OutSupport.java
@@ -19,9 +19,9 @@ package org.apache.taglibs.standard.tag.common.core;
import java.io.IOException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
import org.apache.taglibs.standard.util.EscapeXML;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
index 3a02ded..a2dd06d 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
@@ -22,10 +22,10 @@ import java.net.URLEncoder;
import java.util.LinkedList;
import java.util.List;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-import javax.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.tagext.Tag;
import org.apache.taglibs.standard.resources.Resources;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
index 596f47c..1de44a2 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
@@ -17,11 +17,11 @@
package org.apache.taglibs.standard.tag.common.core;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
import org.apache.taglibs.standard.util.UrlUtil;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RemoveTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RemoveTag.java
index 9a23d60..8528e1b 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RemoveTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RemoveTag.java
@@ -17,9 +17,9 @@
package org.apache.taglibs.standard.tag.common.core;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.TagSupport;
/**
* <p>A handler for the <remove> tag, which removes the variable
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java
index 0d79389..c309e13 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java
@@ -24,17 +24,17 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Map;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ExpressionFactory;
-import javax.el.ValueExpression;
-import javax.el.VariableMapper;
-import javax.servlet.jsp.JspApplicationContext;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspFactory;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.ValueExpression;
+import jakarta.el.VariableMapper;
+import jakarta.servlet.jsp.JspApplicationContext;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspFactory;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
import org.apache.taglibs.standard.resources.Resources;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/UrlSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
index afa6bf6..20c0a7c 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
@@ -17,12 +17,12 @@
package org.apache.taglibs.standard.tag.common.core;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
import org.apache.taglibs.standard.resources.Resources;
import org.apache.taglibs.standard.util.UrlUtil;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/Util.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/Util.java
index 0dfa0cb..3af5743 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/Util.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/Util.java
@@ -21,9 +21,9 @@ import java.text.DateFormat;
import java.util.Enumeration;
import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
import org.apache.taglibs.standard.resources.Resources;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/WhenTagSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/WhenTagSupport.java
index 8c31aac..3f2ca36 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/WhenTagSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/WhenTagSupport.java
@@ -17,10 +17,10 @@
package org.apache.taglibs.standard.tag.common.core;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.jstl.core.ConditionalTagSupport;
-import javax.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.jstl.core.ConditionalTagSupport;
+import jakarta.servlet.jsp.tagext.Tag;
import org.apache.taglibs.standard.resources.Resources;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
index 1792f6a..2128414 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
@@ -22,12 +22,12 @@ import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.jstl.core.Config;
-import javax.servlet.jsp.jstl.fmt.LocalizationContext;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.jstl.core.Config;
+import jakarta.servlet.jsp.jstl.fmt.LocalizationContext;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
import org.apache.taglibs.standard.tag.common.core.Util;
@@ -136,12 +136,12 @@ public abstract class BundleSupport extends BodyTagSupport {
* <p>Check if a match exists between the ordered set of preferred
* locales and the available locales, for the given base name.
* The set of preferred locales consists of a single locale
- * (if the <tt>javax.servlet.jsp.jstl.fmt.locale</tt> configuration
+ * (if the <tt>jakarta.servlet.jsp.jstl.fmt.locale</tt> configuration
* setting is present) or is equal to the client's preferred locales
* determined from the client's browser settings.
* <p>If no match was found in the previous step, check if a match
* exists between the fallback locale (given by the
- * <tt>javax.servlet.jsp.jstl.fmt.fallbackLocale</tt> configuration
+ * <tt>jakarta.servlet.jsp.jstl.fmt.fallbackLocale</tt> configuration
* setting) and the available locales, for the given base name.
*
* @param pc Page in which the resource bundle with the
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java
index 2880ee3..0ba48f4 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java
@@ -24,10 +24,10 @@ import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.TagSupport;
import org.apache.taglibs.standard.resources.Resources;
import org.apache.taglibs.standard.tag.common.core.Util;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java
index 7db06d1..42b933b 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java
@@ -24,10 +24,10 @@ import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
import java.util.Locale;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
import org.apache.taglibs.standard.resources.Resources;
import org.apache.taglibs.standard.tag.common.core.Util;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/MessageSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/MessageSupport.java
index 4d3c45e..4959e89 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/MessageSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/MessageSupport.java
@@ -25,12 +25,12 @@ import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.jstl.fmt.LocalizationContext;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-import javax.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.jstl.fmt.LocalizationContext;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.tagext.Tag;
import org.apache.taglibs.standard.tag.common.core.Util;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParamSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParamSupport.java
index 527323a..2543373 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParamSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParamSupport.java
@@ -17,10 +17,10 @@
package org.apache.taglibs.standard.tag.common.fmt;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-import javax.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.tagext.Tag;
import org.apache.taglibs.standard.resources.Resources;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseDateSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseDateSupport.java
index 61d6180..ff0b9e5 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseDateSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseDateSupport.java
@@ -25,10 +25,10 @@ import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
import org.apache.taglibs.standard.resources.Resources;
import org.apache.taglibs.standard.tag.common.core.Util;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseNumberSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseNumberSupport.java
index 90a8e21..641ae1a 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseNumberSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseNumberSupport.java
@@ -24,10 +24,10 @@ import java.text.NumberFormat;
import java.text.ParseException;
import java.util.Locale;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
import org.apache.taglibs.standard.resources.Resources;
import org.apache.taglibs.standard.tag.common.core.Util;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/RequestEncodingSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/RequestEncodingSupport.java
index 600a982..fa93109 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/RequestEncodingSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/RequestEncodingSupport.java
@@ -19,10 +19,10 @@ package org.apache.taglibs.standard.tag.common.fmt;
import java.io.UnsupportedEncodingException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.TagSupport;
/**
* Support for tag handlers for <requestEncoding>, the tag for setting
@@ -38,7 +38,7 @@ public abstract class RequestEncodingSupport extends TagSupport {
// Package-scoped constants
static final String REQUEST_CHAR_SET =
- "javax.servlet.jsp.jstl.fmt.request.charset";
+ "jakarta.servlet.jsp.jstl.fmt.request.charset";
//*********************************************************************
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java
index bd9c602..63b4804 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java
@@ -17,11 +17,11 @@
package org.apache.taglibs.standard.tag.common.fmt;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.jstl.core.Config;
-import javax.servlet.jsp.jstl.fmt.LocalizationContext;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.jstl.core.Config;
+import jakarta.servlet.jsp.jstl.fmt.LocalizationContext;
+import jakarta.servlet.jsp.tagext.TagSupport;
import org.apache.taglibs.standard.tag.common.core.Util;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java
index 8f1a8d1..fe1f2d7 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java
@@ -24,14 +24,14 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Locale;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.jstl.core.Config;
-import javax.servlet.jsp.jstl.fmt.LocalizationContext;
-import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.jstl.core.Config;
+import jakarta.servlet.jsp.jstl.fmt.LocalizationContext;
+import jakarta.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.tagext.TagSupport;
import org.apache.taglibs.standard.tag.common.core.Util;
@@ -123,7 +123,7 @@ public abstract class SetLocaleSupport extends TagSupport {
/*
* Stores the given locale in the response object of the given page
* context, and stores the locale's associated charset in the
- * javax.servlet.jsp.jstl.fmt.request.charset session attribute, which
+ * jakarta.servlet.jsp.jstl.fmt.request.charset session attribute, which
* may be used by the <requestEncoding> action in a page invoked by a
* form included in the response to set the request charset to the same as
* the response charset (this makes it possible for the container to
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java
index a9c8376..8d39c35 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java
@@ -19,10 +19,10 @@ package org.apache.taglibs.standard.tag.common.fmt;
import java.util.TimeZone;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.jstl.core.Config;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.jstl.core.Config;
+import jakarta.servlet.jsp.tagext.TagSupport;
import org.apache.taglibs.standard.tag.common.core.Util;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java
index 01b8235..8721647 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java
@@ -20,12 +20,12 @@ package org.apache.taglibs.standard.tag.common.fmt;
import java.io.IOException;
import java.util.TimeZone;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.jstl.core.Config;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-import javax.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.jstl.core.Config;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.tagext.Tag;
/**
* Support for tag handlers for <timeZone>, the time zone tag in
@@ -120,7 +120,7 @@ public abstract class TimeZoneSupport extends BodyTagSupport {
* the time zone is taken from the enclosing <timeZone> action.
*
* <p> Otherwise, the time zone configuration setting
- * <tt>javax.servlet.jsp.jstl.core.Config.FMT_TIME_ZONE</tt>
+ * <tt>jakarta.servlet.jsp.jstl.core.Config.FMT_TIME_ZONE</tt>
* is used.
*
* @param pageContext the page containing the action for which the
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceUtil.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceUtil.java
index f777a42..d4b6788 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceUtil.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceUtil.java
@@ -20,10 +20,10 @@ package org.apache.taglibs.standard.tag.common.sql;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.jstl.core.Config;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.jstl.core.Config;
import javax.sql.DataSource;
import org.apache.taglibs.standard.resources.Resources;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DateParamTagSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DateParamTagSupport.java
index 0759916..846aded 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DateParamTagSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DateParamTagSupport.java
@@ -16,10 +16,10 @@
*/
package org.apache.taglibs.standard.tag.common.sql;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.jstl.sql.SQLExecutionTag;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.jstl.sql.SQLExecutionTag;
+import jakarta.servlet.jsp.tagext.TagSupport;
import org.apache.taglibs.standard.resources.Resources;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java
index fc19a79..1fb7995 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java
@@ -16,10 +16,10 @@
*/
package org.apache.taglibs.standard.tag.common.sql;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.jstl.sql.SQLExecutionTag;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.jstl.sql.SQLExecutionTag;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
import org.apache.taglibs.standard.resources.Resources;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java
index 718dba8..3641c95 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java
@@ -24,14 +24,14 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.jstl.core.Config;
-import javax.servlet.jsp.jstl.sql.Result;
-import javax.servlet.jsp.jstl.sql.SQLExecutionTag;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-import javax.servlet.jsp.tagext.TryCatchFinally;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.jstl.core.Config;
+import jakarta.servlet.jsp.jstl.sql.Result;
+import jakarta.servlet.jsp.jstl.sql.SQLExecutionTag;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.tagext.TryCatchFinally;
import javax.sql.DataSource;
import org.apache.taglibs.standard.resources.Resources;
@@ -172,7 +172,7 @@ public abstract class QueryTagSupport extends BodyTagSupport
* from the <code>DataSource</code> specified by the
* <code>dataSource</code> attribute, provided by a parent action
* element, or is retrieved from a JSP scope attribute
- * named <code>javax.servlet.jstl.sql.dataSource</code>.
+ * named <code>jakarta.servlet.jstl.sql.dataSource</code>.
*/
@Override
public int doEndTag() throws JspException {
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java
index c8cc192..4e68dd2 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.SortedMap;
import java.util.TreeMap;
-import javax.servlet.jsp.jstl.sql.Result;
+import jakarta.servlet.jsp.jstl.sql.Result;
/**
* <p>This class creates a cached version of a <tt>ResultSet</tt>.
@@ -33,7 +33,7 @@ import javax.servlet.jsp.jstl.sql.Result;
* returing an array of <tt>Row</tt> objects containing a <tt>Column</tt>
* instance for each column in the row.</p>
* <p>Note -- this is a private copy for the RI to avoid making the
- * corresponding class in javax.servlet.* public.</p>
+ * corresponding class in jakarta.servlet.* public.</p>
*
* @author Hans Bergsten
* @author Justyna Horwat
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java
index c4fa928..2a179e8 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java
@@ -17,11 +17,11 @@
package org.apache.taglibs.standard.tag.common.sql;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.jstl.core.Config;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.jstl.core.Config;
+import jakarta.servlet.jsp.tagext.TagSupport;
import javax.sql.DataSource;
import org.apache.taglibs.standard.resources.Resources;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java
index f29dc37..40d58fa 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java
@@ -20,10 +20,10 @@ package org.apache.taglibs.standard.tag.common.sql;
import java.sql.Connection;
import java.sql.SQLException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.tagext.TagSupport;
-import javax.servlet.jsp.tagext.TryCatchFinally;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.tagext.TryCatchFinally;
import javax.sql.DataSource;
import org.apache.taglibs.standard.resources.Resources;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java
index d9fff68..7b58b67 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java
@@ -23,12 +23,12 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.jstl.sql.SQLExecutionTag;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-import javax.servlet.jsp.tagext.TryCatchFinally;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.jstl.sql.SQLExecutionTag;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.tagext.TryCatchFinally;
import javax.sql.DataSource;
import org.apache.taglibs.standard.resources.Resources;
@@ -132,7 +132,7 @@ public abstract class UpdateTagSupport extends BodyTagSupport
* from the <code>DataSource</code> specified by the
* <code>dataSource</code> attribute, provided by a parent action
* element, or is retrieved from a JSP scope attribute
- * named <code>javax.servlet.jsp.jstl.sql.dataSource</code>.
+ * named <code>jakarta.servlet.jsp.jstl.sql.dataSource</code>.
*/
@Override
public int doEndTag() throws JspException {
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ExprSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ExprSupport.java
index 9231deb..445ead2 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ExprSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ExprSupport.java
@@ -19,9 +19,9 @@ package org.apache.taglibs.standard.tag.common.xml;
import java.io.IOException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.tagext.TagSupport;
import javax.xml.transform.TransformerException;
import org.apache.taglibs.standard.util.EscapeXML;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ForEachTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ForEachTag.java
index 83ff8dd..cc009d2 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ForEachTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ForEachTag.java
@@ -17,9 +17,9 @@
package org.apache.taglibs.standard.tag.common.xml;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.jstl.core.LoopTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.jstl.core.LoopTagSupport;
import javax.xml.transform.TransformerException;
import org.apache.xml.dtm.DTMIterator;
@@ -31,7 +31,7 @@ import org.apache.xpath.objects.XObject;
* Implementation of <x:forEach> tag using low-level Xalan API.
*
* @author Shawn Bayern
- * @see javax.servlet.jsp.jstl.core.LoopTagSupport
+ * @see jakarta.servlet.jsp.jstl.core.LoopTagSupport
*/
public class ForEachTag extends LoopTagSupport {
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/IfTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/IfTag.java
index 918ca87..e4490d4 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/IfTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/IfTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.common.xml;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.jstl.core.ConditionalTagSupport;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.jstl.core.ConditionalTagSupport;
import javax.xml.transform.TransformerException;
import org.apache.xpath.XPath;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStack.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStack.java
index f471e6f..4e771c7 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStack.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStack.java
@@ -19,9 +19,9 @@ package org.apache.taglibs.standard.tag.common.xml;
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
import javax.xml.transform.TransformerException;
import org.apache.taglibs.standard.resources.Resources;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java
index 2bf8b64..01eaefc 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java
@@ -17,10 +17,10 @@
package org.apache.taglibs.standard.tag.common.xml;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-import javax.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.tagext.Tag;
import org.apache.taglibs.standard.resources.Resources;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
index 2851831..15a0bc5 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
@@ -21,10 +21,10 @@ import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerConfigurationException;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/SetTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/SetTag.java
index ba99150..553ec7f 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/SetTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/SetTag.java
@@ -17,10 +17,10 @@
package org.apache.taglibs.standard.tag.common.xml;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.TagSupport;
import javax.xml.transform.TransformerException;
import org.apache.taglibs.standard.tag.common.core.Util;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
index 0f477ea..a6ec0a8 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
@@ -21,10 +21,10 @@ import java.io.Reader;
import java.io.StringReader;
import java.util.List;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/WhenTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/WhenTag.java
index bdf7b86..dd4f45e 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/WhenTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/WhenTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.common.xml;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import javax.xml.transform.TransformerException;
import org.apache.taglibs.standard.tag.common.core.WhenTagSupport;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XalanUtil.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XalanUtil.java
index 3fd98ae..c0e3e6b 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XalanUtil.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XalanUtil.java
@@ -16,9 +16,9 @@
*/
package org.apache.taglibs.standard.tag.common.xml;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.tagext.TagSupport;
import javax.xml.transform.TransformerException;
import org.apache.taglibs.standard.util.XmlUtil;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/ForEachTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/ForEachTag.java
index d700535..d7c069a 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/ForEachTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/ForEachTag.java
@@ -19,9 +19,9 @@ package org.apache.taglibs.standard.tag.rt.core;
import java.util.ArrayList;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.jstl.core.LoopTag;
-import javax.servlet.jsp.tagext.IterationTag;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.jstl.core.LoopTag;
+import jakarta.servlet.jsp.tagext.IterationTag;
import org.apache.taglibs.standard.tag.common.core.ForEachSupport;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/ForTokensTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/ForTokensTag.java
index 34a6756..b51eaba 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/ForTokensTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/ForTokensTag.java
@@ -17,9 +17,9 @@
package org.apache.taglibs.standard.tag.rt.core;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.jstl.core.LoopTag;
-import javax.servlet.jsp.tagext.IterationTag;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.jstl.core.LoopTag;
+import jakarta.servlet.jsp.tagext.IterationTag;
import org.apache.taglibs.standard.tag.common.core.ForTokensSupport;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/IfTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/IfTag.java
index ebd666b..0bef554 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/IfTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/IfTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.rt.core;
-import javax.servlet.jsp.jstl.core.ConditionalTagSupport;
+import jakarta.servlet.jsp.jstl.core.ConditionalTagSupport;
/**
* <p>Tag handler for <if> in JSTL's rtexprvalue library. Because
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/ImportTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/ImportTag.java
index 5677370..3e451f5 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/ImportTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/ImportTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.rt.core;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import org.apache.taglibs.standard.tag.common.core.ImportSupport;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/ParamTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/ParamTag.java
index 77389de..36c2fa3 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/ParamTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/ParamTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.rt.core;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import org.apache.taglibs.standard.tag.common.core.ParamSupport;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/RedirectTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/RedirectTag.java
index e04da11..5a647ac 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/RedirectTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/RedirectTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.rt.core;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import org.apache.taglibs.standard.tag.common.core.RedirectSupport;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/UrlTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/UrlTag.java
index 9f6ba93..7632364 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/UrlTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/UrlTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.rt.core;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import org.apache.taglibs.standard.tag.common.core.UrlSupport;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/BundleTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/BundleTag.java
index 552e209..73eecd2 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/BundleTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/BundleTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.rt.fmt;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import org.apache.taglibs.standard.tag.common.fmt.BundleSupport;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/FormatDateTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/FormatDateTag.java
index 7713bb8..6f2b79a 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/FormatDateTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/FormatDateTag.java
@@ -19,7 +19,7 @@ package org.apache.taglibs.standard.tag.rt.fmt;
import java.util.Date;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import org.apache.taglibs.standard.tag.common.fmt.FormatDateSupport;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/FormatNumberTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/FormatNumberTag.java
index 5d62ef2..2c0fd9e 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/FormatNumberTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/FormatNumberTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.rt.fmt;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import org.apache.taglibs.standard.tag.common.fmt.FormatNumberSupport;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/MessageTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/MessageTag.java
index 2be0bd2..fb8ca6f 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/MessageTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/MessageTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.rt.fmt;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.jstl.fmt.LocalizationContext;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.jstl.fmt.LocalizationContext;
import org.apache.taglibs.standard.tag.common.fmt.MessageSupport;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParamTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParamTag.java
index 3fef05c..aecc0a3 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParamTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParamTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.rt.fmt;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import org.apache.taglibs.standard.tag.common.fmt.ParamSupport;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseDateTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseDateTag.java
index c93a6f1..787dd82 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseDateTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseDateTag.java
@@ -19,7 +19,7 @@ package org.apache.taglibs.standard.tag.rt.fmt;
import java.util.Locale;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import org.apache.taglibs.standard.tag.common.fmt.LocaleUtil;
import org.apache.taglibs.standard.tag.common.fmt.ParseDateSupport;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseNumberTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseNumberTag.java
index 54c3cb4..4552f80 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseNumberTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseNumberTag.java
@@ -19,7 +19,7 @@ package org.apache.taglibs.standard.tag.rt.fmt;
import java.util.Locale;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import org.apache.taglibs.standard.tag.common.fmt.LocaleUtil;
import org.apache.taglibs.standard.tag.common.fmt.ParseNumberSupport;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/RequestEncodingTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/RequestEncodingTag.java
index 10a444a..0c3e51b 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/RequestEncodingTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/RequestEncodingTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.rt.fmt;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import org.apache.taglibs.standard.tag.common.fmt.RequestEncodingSupport;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetBundleTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetBundleTag.java
index 8011424..38ebdf3 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetBundleTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetBundleTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.rt.fmt;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import org.apache.taglibs.standard.tag.common.fmt.SetBundleSupport;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetLocaleTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetLocaleTag.java
index 6df340e..7cb66cb 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetLocaleTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetLocaleTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.rt.fmt;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import org.apache.taglibs.standard.tag.common.fmt.SetLocaleSupport;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetTimeZoneTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetTimeZoneTag.java
index 25732ef..5c272c0 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetTimeZoneTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetTimeZoneTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.rt.fmt;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import org.apache.taglibs.standard.tag.common.fmt.SetTimeZoneSupport;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/TimeZoneTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/TimeZoneTag.java
index e2f3650..6328a79 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/TimeZoneTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/TimeZoneTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.rt.fmt;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import org.apache.taglibs.standard.tag.common.fmt.TimeZoneSupport;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java
index aaddde3..64dfeb2 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java
@@ -16,7 +16,7 @@
*/
package org.apache.taglibs.standard.tag.rt.sql;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.sql.TransactionTagSupport;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ParamTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ParamTag.java
index 828187c..e065569 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ParamTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ParamTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.rt.xml;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import org.apache.taglibs.standard.tag.common.xml.ParamSupport;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ParseTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ParseTag.java
index 6eb1675..71dc7d4 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ParseTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ParseTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.rt.xml;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import org.apache.taglibs.standard.tag.common.xml.ParseSupport;
import org.xml.sax.XMLFilter;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/TransformTag.java b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/TransformTag.java
index ccd4653..455f733 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/TransformTag.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/TransformTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.rt.xml;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import javax.xml.transform.Result;
import org.apache.taglibs.standard.tag.common.xml.TransformSupport;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tei/DeclareTEI.java b/impl/src/main/java/org/apache/taglibs/standard/tei/DeclareTEI.java
index 5c00304..1a4a66f 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tei/DeclareTEI.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tei/DeclareTEI.java
@@ -17,9 +17,9 @@
package org.apache.taglibs.standard.tei;
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.VariableInfo;
/**
* <p>An implementation of TagExtraInfo provided for <declare>.
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tei/ForEachTEI.java b/impl/src/main/java/org/apache/taglibs/standard/tei/ForEachTEI.java
index e940a22..9642c67 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tei/ForEachTEI.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tei/ForEachTEI.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tei;
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
/**
* <p>An implementation of TagExtraInfo that implements validation for
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tei/ImportTEI.java b/impl/src/main/java/org/apache/taglibs/standard/tei/ImportTEI.java
index 3066886..d9143d4 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tei/ImportTEI.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tei/ImportTEI.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tei;
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
/**
* <p>An implementation of TagExtraInfo that implements validation for
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tei/Util.java b/impl/src/main/java/org/apache/taglibs/standard/tei/Util.java
index 8dde5f3..04a0191 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tei/Util.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tei/Util.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tei;
-import javax.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagData;
/**
* <p>Utilities in support of TagExtraInfo classes.</p>
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tei/XmlParseTEI.java b/impl/src/main/java/org/apache/taglibs/standard/tei/XmlParseTEI.java
index d56d8d9..e45103d 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tei/XmlParseTEI.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tei/XmlParseTEI.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tei;
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
/**
* <p>An implementation of TagExtraInfo that implements validation for
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tei/XmlTransformTEI.java b/impl/src/main/java/org/apache/taglibs/standard/tei/XmlTransformTEI.java
index bb25061..41a3a37 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tei/XmlTransformTEI.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tei/XmlTransformTEI.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tei;
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
/**
* <p>An implementation of TagExtraInfo that implements validation for
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java b/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
index 058e5d6..ad5a16c 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
@@ -27,10 +27,10 @@ import java.util.Set;
import java.util.StringTokenizer;
import java.util.Vector;
-import javax.servlet.jsp.tagext.PageData;
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagLibraryValidator;
-import javax.servlet.jsp.tagext.ValidationMessage;
+import jakarta.servlet.jsp.tagext.PageData;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagLibraryValidator;
+import jakarta.servlet.jsp.tagext.ValidationMessage;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.taglibs.standard.resources.Resources;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java b/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java
index 037efcc..b2a5590 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java
@@ -20,8 +20,8 @@ package org.apache.taglibs.standard.tlv;
import java.util.Set;
import java.util.Stack;
-import javax.servlet.jsp.tagext.PageData;
-import javax.servlet.jsp.tagext.ValidationMessage;
+import jakarta.servlet.jsp.tagext.PageData;
+import jakarta.servlet.jsp.tagext.ValidationMessage;
import org.apache.taglibs.standard.resources.Resources;
import org.xml.sax.Attributes;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java b/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java
index bec6940..d6e0014 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java
@@ -20,8 +20,8 @@ package org.apache.taglibs.standard.tlv;
import java.util.Set;
import java.util.Stack;
-import javax.servlet.jsp.tagext.PageData;
-import javax.servlet.jsp.tagext.ValidationMessage;
+import jakarta.servlet.jsp.tagext.PageData;
+import jakarta.servlet.jsp.tagext.ValidationMessage;
import org.apache.taglibs.standard.resources.Resources;
import org.xml.sax.Attributes;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlSqlTLV.java b/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlSqlTLV.java
index bf20370..a27937c 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlSqlTLV.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlSqlTLV.java
@@ -20,8 +20,8 @@ package org.apache.taglibs.standard.tlv;
import java.util.Set;
import java.util.Stack;
-import javax.servlet.jsp.tagext.PageData;
-import javax.servlet.jsp.tagext.ValidationMessage;
+import jakarta.servlet.jsp.tagext.PageData;
+import jakarta.servlet.jsp.tagext.ValidationMessage;
import org.apache.taglibs.standard.resources.Resources;
import org.xml.sax.Attributes;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlXmlTLV.java b/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlXmlTLV.java
index abb9760..bb9c79e 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlXmlTLV.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlXmlTLV.java
@@ -20,8 +20,8 @@ package org.apache.taglibs.standard.tlv;
import java.util.Set;
import java.util.Stack;
-import javax.servlet.jsp.tagext.PageData;
-import javax.servlet.jsp.tagext.ValidationMessage;
+import jakarta.servlet.jsp.tagext.PageData;
+import jakarta.servlet.jsp.tagext.ValidationMessage;
import org.apache.taglibs.standard.resources.Resources;
import org.xml.sax.Attributes;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/util/EscapeXML.java b/impl/src/main/java/org/apache/taglibs/standard/util/EscapeXML.java
index cac0a50..fc56feb 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/util/EscapeXML.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/util/EscapeXML.java
@@ -19,7 +19,7 @@ package org.apache.taglibs.standard.util;
import java.io.IOException;
import java.io.Reader;
-import javax.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.JspWriter;
/**
* Handles escaping of characters that could be interpreted as XML markup.
diff --git a/impl/src/main/java/org/apache/taglibs/standard/util/ExpressionUtil.java b/impl/src/main/java/org/apache/taglibs/standard/util/ExpressionUtil.java
index fb027da..af2fcbe 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/util/ExpressionUtil.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/util/ExpressionUtil.java
@@ -16,11 +16,11 @@
*/
package org.apache.taglibs.standard.util;
-import javax.el.ExpressionFactory;
-import javax.el.ValueExpression;
-import javax.servlet.jsp.JspApplicationContext;
-import javax.servlet.jsp.JspFactory;
-import javax.servlet.jsp.PageContext;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.ValueExpression;
+import jakarta.servlet.jsp.JspApplicationContext;
+import jakarta.servlet.jsp.JspFactory;
+import jakarta.servlet.jsp.PageContext;
/**
* Helper functions for working with EL expressions.
diff --git a/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java b/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
index ee5ce3e..f2db9b5 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
@@ -26,8 +26,8 @@ import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/impl/src/test/java/org/apache/taglibs/standard/functions/FunctionsTest.java b/impl/src/test/java/org/apache/taglibs/standard/functions/FunctionsTest.java
index 892c547..59bde70 100644
--- a/impl/src/test/java/org/apache/taglibs/standard/functions/FunctionsTest.java
+++ b/impl/src/test/java/org/apache/taglibs/standard/functions/FunctionsTest.java
@@ -19,7 +19,7 @@ package org.apache.taglibs.standard.functions;
import java.util.Arrays;
import java.util.Collections;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
import org.apache.taglibs.standard.resources.Resources;
import org.junit.Assert;
diff --git a/impl/src/test/java/org/apache/taglibs/standard/tag/common/core/SetSupportTest.java b/impl/src/test/java/org/apache/taglibs/standard/tag/common/core/SetSupportTest.java
index 74e7e2d..f4c50d0 100644
--- a/impl/src/test/java/org/apache/taglibs/standard/tag/common/core/SetSupportTest.java
+++ b/impl/src/test/java/org/apache/taglibs/standard/tag/common/core/SetSupportTest.java
@@ -18,16 +18,16 @@ package org.apache.taglibs.standard.tag.common.core;
import java.util.Map;
-import javax.el.ELContext;
-import javax.el.ExpressionFactory;
-import javax.el.ValueExpression;
-import javax.el.VariableMapper;
-import javax.servlet.jsp.JspApplicationContext;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspFactory;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyContent;
+import jakarta.el.ELContext;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.ValueExpression;
+import jakarta.el.VariableMapper;
+import jakarta.servlet.jsp.JspApplicationContext;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspFactory;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyContent;
import org.apache.taglibs.standard.resources.Resources;
import org.junit.After;
diff --git a/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java b/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
index 078f855..3a829c4 100644
--- a/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
+++ b/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.taglibs.standard.tag.common.fmt;
-import javax.servlet.jsp.tagext.BodyContent;
+import jakarta.servlet.jsp.tagext.BodyContent;
import org.easymock.EasyMock;
import org.junit.Assert;
diff --git a/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ExprSupportTest.java b/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ExprSupportTest.java
index 492e42b..8b44ee7 100644
--- a/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ExprSupportTest.java
+++ b/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ExprSupportTest.java
@@ -18,8 +18,8 @@ package org.apache.taglibs.standard.tag.common.xml;
import java.io.InputStream;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.PageContext;
import javax.xml.parsers.DocumentBuilder;
import org.junit.Before;
diff --git a/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java b/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java
index 558693d..95e443d 100644
--- a/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java
+++ b/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java
@@ -18,8 +18,8 @@ package org.apache.taglibs.standard.tag.common.xml;
import java.io.InputStream;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.IterationTag;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.IterationTag;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.xpath.XPathConstants;
diff --git a/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStackTest.java b/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStackTest.java
index 03624dc..f1980c8 100644
--- a/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStackTest.java
+++ b/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStackTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.taglibs.standard.tag.common.xml;
-import javax.servlet.ServletContext;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
diff --git a/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/TransformSupportTest.java b/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/TransformSupportTest.java
index c1a8b3f..aeee99b 100644
--- a/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/TransformSupportTest.java
+++ b/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/TransformSupportTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.taglibs.standard.tag.common.xml;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.junit.Before;
import org.junit.Test;
diff --git a/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/XalanUtilTest.java b/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/XalanUtilTest.java
index f1f65c6..9e14afb 100644
--- a/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/XalanUtilTest.java
+++ b/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/XalanUtilTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.taglibs.standard.tag.common.xml;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.Tag;
import org.apache.xpath.XPath;
import org.apache.xpath.XPathContext;
diff --git a/impl/src/test/java/org/apache/taglibs/standard/util/EscapeXMLTest.java b/impl/src/test/java/org/apache/taglibs/standard/util/EscapeXMLTest.java
index 7c42b98..d51b895 100644
--- a/impl/src/test/java/org/apache/taglibs/standard/util/EscapeXMLTest.java
+++ b/impl/src/test/java/org/apache/taglibs/standard/util/EscapeXMLTest.java
@@ -20,7 +20,7 @@ import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
-import javax.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.JspWriter;
import org.junit.Assert;
import org.junit.Before;
diff --git a/jstlel/pom.xml b/jstlel/pom.xml
index ceeabb5..7001f39 100644
--- a/jstlel/pom.xml
+++ b/jstlel/pom.xml
@@ -48,18 +48,18 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>jakarta.servlet.jsp</groupId>
+ <artifactId>jakarta.servlet.jsp-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java
index 7876908..43299ba 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java
@@ -25,7 +25,7 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
import org.apache.taglibs.standard.lang.jstl.parser.ELParser;
import org.apache.taglibs.standard.lang.jstl.parser.ParseException;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Evaluator.java b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Evaluator.java
index eadd106..99c97a8 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Evaluator.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Evaluator.java
@@ -20,9 +20,9 @@ package org.apache.taglibs.standard.lang.jstl;
import java.text.MessageFormat;
import java.util.Map;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.Tag;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluator;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java
index 99cfb16..8bb6cee 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java
@@ -25,10 +25,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.ServletContext;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
/**
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/JSTLVariableResolver.java b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/JSTLVariableResolver.java
index 62da80f..b3a64ab 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/JSTLVariableResolver.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/JSTLVariableResolver.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.lang.jstl;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
/**
* <p>This is the JSTL-specific implementation of VariableResolver.
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java
index edfa2d9..c1a140f 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java
@@ -755,7 +755,7 @@ public class ELParser implements ELParserConstants {
;
}
jj_consume_token(RPAREN);
- String allowed = System.getProperty("javax.servlet.jsp.functions.allowed");
+ String allowed = System.getProperty("jakarta.servlet.jsp.functions.allowed");
if (allowed == null || !allowed.equalsIgnoreCase("true"))
{if (true) throw new ParseException("EL functions are not supported.");}
{if (true) return new FunctionInvocation(qualifiedName, argumentList);}
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java b/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java
index 4427f91..a12c0c9 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java
@@ -17,9 +17,9 @@
package org.apache.taglibs.standard.lang.support;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.Tag;
/**
* <p>The interface for an expression-language validator and evaluator.
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluatorManager.java b/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluatorManager.java
index 6e26191..e9738bf 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluatorManager.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluatorManager.java
@@ -20,9 +20,9 @@ package org.apache.taglibs.standard.lang.support;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.Tag;
import org.apache.taglibs.standard.lang.jstl.Coercions;
import org.apache.taglibs.standard.lang.jstl.ELException;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/ExpressionUtil.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/ExpressionUtil.java
index 0995683..54882ae 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/ExpressionUtil.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/ExpressionUtil.java
@@ -17,9 +17,9 @@
package org.apache.taglibs.standard.tag.el.core;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.Tag;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/ForEachTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/ForEachTag.java
index dd3a51e..5241ba8 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/ForEachTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/ForEachTag.java
@@ -19,9 +19,9 @@ package org.apache.taglibs.standard.tag.el.core;
import java.util.ArrayList;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.jstl.core.LoopTag;
-import javax.servlet.jsp.tagext.IterationTag;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.jstl.core.LoopTag;
+import jakarta.servlet.jsp.tagext.IterationTag;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.core.ForEachSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/ForTokensTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/ForTokensTag.java
index b42b171..54cb430 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/ForTokensTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/ForTokensTag.java
@@ -17,9 +17,9 @@
package org.apache.taglibs.standard.tag.el.core;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.jstl.core.LoopTag;
-import javax.servlet.jsp.tagext.IterationTag;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.jstl.core.LoopTag;
+import jakarta.servlet.jsp.tagext.IterationTag;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.core.ForTokensSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/IfTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/IfTag.java
index 6e752b9..32e5231 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/IfTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/IfTag.java
@@ -17,9 +17,9 @@
package org.apache.taglibs.standard.tag.el.core;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.jstl.core.ConditionalTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.jstl.core.ConditionalTagSupport;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/ImportTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/ImportTag.java
index a106ad5..63b3a3d 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/ImportTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/ImportTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.core;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.core.ImportSupport;
import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/OutTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/OutTag.java
index ebc4db5..e09a924 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/OutTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/OutTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.core;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.core.OutSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/ParamTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/ParamTag.java
index 77e17c7..19adbfe 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/ParamTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/ParamTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.core;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.core.ParamSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/RedirectTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/RedirectTag.java
index b24231f..f95945a 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/RedirectTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/RedirectTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.core;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.core.RedirectSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/SetTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/SetTag.java
index 2268175..989d807 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/SetTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/SetTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.core;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.core.SetSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/UrlTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/UrlTag.java
index e8dd9bc..de04891 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/UrlTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/UrlTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.core;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.core.UrlSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/WhenTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/WhenTag.java
index 79c84ab..b784645 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/WhenTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/WhenTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.el.core;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/BundleTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/BundleTag.java
index 5bfc254..53325d3 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/BundleTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/BundleTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.fmt;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.fmt.BundleSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/FormatDateTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/FormatDateTag.java
index 5918755..3365e93 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/FormatDateTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/FormatDateTag.java
@@ -19,7 +19,7 @@ package org.apache.taglibs.standard.tag.el.fmt;
import java.util.Date;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.fmt.FormatDateSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/FormatNumberTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/FormatNumberTag.java
index 6391980..231a3bb 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/FormatNumberTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/FormatNumberTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.fmt;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.fmt.FormatNumberSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/MessageTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/MessageTag.java
index 8e31935..6267138 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/MessageTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/MessageTag.java
@@ -17,8 +17,8 @@
package org.apache.taglibs.standard.tag.el.fmt;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.jstl.fmt.LocalizationContext;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.jstl.fmt.LocalizationContext;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.fmt.MessageSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParamTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParamTag.java
index 8baea8c..0f061ba 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParamTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParamTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.fmt;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.fmt.ParamSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParseDateTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParseDateTag.java
index 427e308..75b6c9f 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParseDateTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParseDateTag.java
@@ -19,7 +19,7 @@ package org.apache.taglibs.standard.tag.el.fmt;
import java.util.Locale;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.fmt.LocaleUtil;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParseNumberTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParseNumberTag.java
index 21627ef..03ef542 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParseNumberTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParseNumberTag.java
@@ -19,7 +19,7 @@ package org.apache.taglibs.standard.tag.el.fmt;
import java.util.Locale;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.fmt.LocaleUtil;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/RequestEncodingTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/RequestEncodingTag.java
index 1a6e3fa..fb3eb73 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/RequestEncodingTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/RequestEncodingTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.fmt;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.fmt.RequestEncodingSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/SetBundleTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/SetBundleTag.java
index a4cf933..5172816 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/SetBundleTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/SetBundleTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.fmt;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.fmt.SetBundleSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/SetLocaleTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/SetLocaleTag.java
index 3beb473..6d98d37 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/SetLocaleTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/SetLocaleTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.fmt;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.fmt.SetLocaleSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/SetTimeZoneTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/SetTimeZoneTag.java
index 5eaa9f9..5a0e53c 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/SetTimeZoneTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/SetTimeZoneTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.fmt;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.fmt.SetTimeZoneSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/TimeZoneTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/TimeZoneTag.java
index 48e018f..f77bae9 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/TimeZoneTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/fmt/TimeZoneTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.fmt;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.fmt.TimeZoneSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/DateParamTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/DateParamTag.java
index b81c7d6..6d06471 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/DateParamTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/DateParamTag.java
@@ -18,7 +18,7 @@ package org.apache.taglibs.standard.tag.el.sql;
import java.util.Date;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.sql.DateParamTagSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/ParamTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/ParamTag.java
index 182f967..5c4aedd 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/ParamTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/ParamTag.java
@@ -16,7 +16,7 @@
*/
package org.apache.taglibs.standard.tag.el.sql;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.sql.ParamTagSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/QueryTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/QueryTag.java
index cd5502a..4f5e11e 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/QueryTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/QueryTag.java
@@ -16,7 +16,7 @@
*/
package org.apache.taglibs.standard.tag.el.sql;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.sql.QueryTagSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/SetDataSourceTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/SetDataSourceTag.java
index 4a04e81..c807f8b 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/SetDataSourceTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/SetDataSourceTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.sql;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.sql.SetDataSourceTagSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/TransactionTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/TransactionTag.java
index 41be213..e1b8ef0 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/TransactionTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/TransactionTag.java
@@ -16,7 +16,7 @@
*/
package org.apache.taglibs.standard.tag.el.sql;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.sql.TransactionTagSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/UpdateTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/UpdateTag.java
index 0e7a71f..d2ad2e4 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/UpdateTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/sql/UpdateTag.java
@@ -16,7 +16,7 @@
*/
package org.apache.taglibs.standard.tag.el.sql;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
import org.apache.taglibs.standard.tag.common.sql.UpdateTagSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/xml/ExprTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/xml/ExprTag.java
index 3166e4c..67ac9e7 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/xml/ExprTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/xml/ExprTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.xml;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.xml.ExprSupport;
import org.apache.taglibs.standard.tag.el.core.ExpressionUtil;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/xml/ParamTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/xml/ParamTag.java
index caef6f4..9d35393 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/xml/ParamTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/xml/ParamTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.xml;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.xml.ParamSupport;
import org.apache.taglibs.standard.tag.el.core.ExpressionUtil;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/xml/ParseTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/xml/ParseTag.java
index c7c2d66..5f9a998 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/xml/ParseTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/xml/ParseTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.xml;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
import org.apache.taglibs.standard.tag.common.xml.ParseSupport;
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/xml/TransformTag.java b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/xml/TransformTag.java
index 35b934f..03d29e5 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/xml/TransformTag.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/xml/TransformTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.xml;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import javax.xml.transform.Result;
import org.apache.taglibs.standard.tag.common.xml.TransformSupport;
diff --git a/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/EvaluationTest.java b/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/EvaluationTest.java
index da1fff6..4a43886 100644
--- a/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/EvaluationTest.java
+++ b/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/EvaluationTest.java
@@ -24,8 +24,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
import junit.framework.TestCase;
import org.apache.taglibs.standard.lang.jstl.Evaluator;
diff --git a/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java b/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java
index 1861874..7726599 100644
--- a/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java
+++ b/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java
@@ -22,17 +22,17 @@ import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
-import javax.el.ELContext;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.el.ExpressionEvaluator;
-import javax.servlet.jsp.el.VariableResolver;
+import jakarta.el.ELContext;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.el.ExpressionEvaluator;
+import jakarta.servlet.jsp.el.VariableResolver;
/**
* <p>This is a "dummy" implementation of PageContext whose only
diff --git a/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java b/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java
index 96d4cad..f80616f 100644
--- a/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java
+++ b/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java
@@ -26,7 +26,7 @@ import java.io.LineNumberReader;
import java.io.PrintWriter;
import java.nio.charset.Charset;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import junit.framework.TestCase;
import org.apache.taglibs.standard.lang.jstl.Evaluator;
@@ -52,7 +52,7 @@ public class ParserTest extends TestCase {
@Test
public void testParser() throws IOException {
try {
- System.setProperty("javax.servlet.jsp.functions.allowed", "true");
+ System.setProperty("jakarta.servlet.jsp.functions.allowed", "true");
BufferedReader in = new BufferedReader(new InputStreamReader(getClass().getResourceAsStream("parserTests.txt"), UTF8));
CharArrayWriter writer = new CharArrayWriter();
PrintWriter out = new PrintWriter(writer);
@@ -68,7 +68,7 @@ public class ParserTest extends TestCase {
actual.close();
expected.close();
} finally {
- System.clearProperty("javax.servlet.jsp.functions.allowed");
+ System.clearProperty("jakarta.servlet.jsp.functions.allowed");
}
}
diff --git a/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/StaticFunctionTest.java b/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/StaticFunctionTest.java
index ff95b1e..be862c6 100644
--- a/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/StaticFunctionTest.java
+++ b/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/StaticFunctionTest.java
@@ -31,7 +31,7 @@ public class StaticFunctionTest extends TestCase {
public void testFunctions() throws Exception {
- System.setProperty("javax.servlet.jsp.functions.allowed", "true");
+ System.setProperty("jakarta.servlet.jsp.functions.allowed", "true");
Map m = getSampleMethodMap();
Evaluator e = new Evaluator();
Object o;
diff --git a/pom.xml b/pom.xml
index e499a28..2b40066 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,19 +133,19 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>5.0.0-M1</version>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <groupId>jakarta.servlet.jsp</groupId>
+ <artifactId>jakarta.servlet.jsp-api</artifactId>
+ <version>3.0.0-M1</version>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
+ <version>4.0.0.M1</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
@@ -219,6 +219,30 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>ban-javax-namespace</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <includes>
+ <include>javax.servlet</include>
+ <include>servletapi</include>
+ <include>javax.servlet.jsp</include>
+ <include>javax.el</include>
+ </includes>
+ </bannedDependencies>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/spec/pom.xml b/spec/pom.xml
index edd1245..9503381 100644
--- a/spec/pom.xml
+++ b/spec/pom.xml
@@ -35,18 +35,18 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>jakarta.servlet.jsp</groupId>
+ <artifactId>jakarta.servlet.jsp-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/spec/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java b/spec/src/main/java/jakarta/servlet/jsp/jstl/core/ConditionalTagSupport.java
similarity index 96%
rename from spec/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java
rename to spec/src/main/java/jakarta/servlet/jsp/jstl/core/ConditionalTagSupport.java
index 5c833b7..f553860 100644
--- a/spec/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java
+++ b/spec/src/main/java/jakarta/servlet/jsp/jstl/core/ConditionalTagSupport.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package javax.servlet.jsp.jstl.core;
+package jakarta.servlet.jsp.jstl.core;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.TagSupport;
/**
* <p>Abstract class that facilitates implementation of conditional actions
diff --git a/spec/src/main/java/javax/servlet/jsp/jstl/core/Config.java b/spec/src/main/java/jakarta/servlet/jsp/jstl/core/Config.java
similarity index 96%
rename from spec/src/main/java/javax/servlet/jsp/jstl/core/Config.java
rename to spec/src/main/java/jakarta/servlet/jsp/jstl/core/Config.java
index bcba912..6980f75 100644
--- a/spec/src/main/java/javax/servlet/jsp/jstl/core/Config.java
+++ b/spec/src/main/java/jakarta/servlet/jsp/jstl/core/Config.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package javax.servlet.jsp.jstl.core;
+package jakarta.servlet.jsp.jstl.core;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.jsp.PageContext;
/**
* Class supporting access to configuration settings.
@@ -36,25 +36,25 @@ public class Config {
* based preferred locale
*/
public static final String FMT_LOCALE
- = "javax.servlet.jsp.jstl.fmt.locale";
+ = "jakarta.servlet.jsp.jstl.fmt.locale";
/**
* Name of configuration setting for fallback locale
*/
public static final String FMT_FALLBACK_LOCALE
- = "javax.servlet.jsp.jstl.fmt.fallbackLocale";
+ = "jakarta.servlet.jsp.jstl.fmt.fallbackLocale";
/**
* Name of configuration setting for i18n localization context
*/
public static final String FMT_LOCALIZATION_CONTEXT
- = "javax.servlet.jsp.jstl.fmt.localizationContext";
+ = "jakarta.servlet.jsp.jstl.fmt.localizationContext";
/**
* Name of localization setting for time zone
*/
public static final String FMT_TIME_ZONE
- = "javax.servlet.jsp.jstl.fmt.timeZone";
+ = "jakarta.servlet.jsp.jstl.fmt.timeZone";
/*
* SQL actions related configuration data
@@ -64,14 +64,14 @@ public class Config {
* Name of configuration setting for SQL data source
*/
public static final String SQL_DATA_SOURCE
- = "javax.servlet.jsp.jstl.sql.dataSource";
+ = "jakarta.servlet.jsp.jstl.sql.dataSource";
/**
* Name of configuration setting for maximum number of rows to be included
* in SQL query result
*/
public static final String SQL_MAX_ROWS
- = "javax.servlet.jsp.jstl.sql.maxRows";
+ = "jakarta.servlet.jsp.jstl.sql.maxRows";
/*
* Private constants
diff --git a/spec/src/main/java/javax/servlet/jsp/jstl/core/IndexedValueExpression.java b/spec/src/main/java/jakarta/servlet/jsp/jstl/core/IndexedValueExpression.java
similarity index 96%
rename from spec/src/main/java/javax/servlet/jsp/jstl/core/IndexedValueExpression.java
rename to spec/src/main/java/jakarta/servlet/jsp/jstl/core/IndexedValueExpression.java
index d426474..a6b364a 100644
--- a/spec/src/main/java/javax/servlet/jsp/jstl/core/IndexedValueExpression.java
+++ b/spec/src/main/java/jakarta/servlet/jsp/jstl/core/IndexedValueExpression.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package javax.servlet.jsp.jstl.core;
+package jakarta.servlet.jsp.jstl.core;
import java.io.Serializable;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
/**
* ValueExpression that refers to a specific member of an indexed variable.
diff --git a/spec/src/main/java/javax/servlet/jsp/jstl/core/IteratedExpression.java b/spec/src/main/java/jakarta/servlet/jsp/jstl/core/IteratedExpression.java
similarity index 98%
rename from spec/src/main/java/javax/servlet/jsp/jstl/core/IteratedExpression.java
rename to spec/src/main/java/jakarta/servlet/jsp/jstl/core/IteratedExpression.java
index d24c16e..13570c4 100644
--- a/spec/src/main/java/javax/servlet/jsp/jstl/core/IteratedExpression.java
+++ b/spec/src/main/java/jakarta/servlet/jsp/jstl/core/IteratedExpression.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package javax.servlet.jsp.jstl.core;
+package jakarta.servlet.jsp.jstl.core;
import java.util.Collection;
import java.util.Enumeration;
@@ -27,8 +27,8 @@ import java.util.Set;
import java.util.StringTokenizer;
import java.util.Vector;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
/**
* Helper class for accessing members of a deferred expression result by index.
@@ -159,4 +159,4 @@ public final class IteratedExpression {
}
return i;
}
-}
\ No newline at end of file
+}
diff --git a/spec/src/main/java/javax/servlet/jsp/jstl/core/IteratedValueExpression.java b/spec/src/main/java/jakarta/servlet/jsp/jstl/core/IteratedValueExpression.java
similarity index 96%
rename from spec/src/main/java/javax/servlet/jsp/jstl/core/IteratedValueExpression.java
rename to spec/src/main/java/jakarta/servlet/jsp/jstl/core/IteratedValueExpression.java
index 16ddecd..6d4dc5a 100644
--- a/spec/src/main/java/javax/servlet/jsp/jstl/core/IteratedValueExpression.java
+++ b/spec/src/main/java/jakarta/servlet/jsp/jstl/core/IteratedValueExpression.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package javax.servlet.jsp.jstl.core;
+package jakarta.servlet.jsp.jstl.core;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
/**
* ValueExpression that refers to a specific member of an indexed variable backed by an IteratedExpression.
diff --git a/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTag.java b/spec/src/main/java/jakarta/servlet/jsp/jstl/core/LoopTag.java
similarity index 96%
rename from spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTag.java
rename to spec/src/main/java/jakarta/servlet/jsp/jstl/core/LoopTag.java
index a8b89b4..6a45513 100644
--- a/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTag.java
+++ b/spec/src/main/java/jakarta/servlet/jsp/jstl/core/LoopTag.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package javax.servlet.jsp.jstl.core;
+package jakarta.servlet.jsp.jstl.core;
-import javax.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.tagext.Tag;
/**
* <p>JSTL allows developers to write custom iteration tags by
diff --git a/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagStatus.java b/spec/src/main/java/jakarta/servlet/jsp/jstl/core/LoopTagStatus.java
similarity index 99%
rename from spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagStatus.java
rename to spec/src/main/java/jakarta/servlet/jsp/jstl/core/LoopTagStatus.java
index 5132639..d9a40f5 100644
--- a/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagStatus.java
+++ b/spec/src/main/java/jakarta/servlet/jsp/jstl/core/LoopTagStatus.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package javax.servlet.jsp.jstl.core;
+package jakarta.servlet.jsp.jstl.core;
/**
* <p>Exposes the current status of
diff --git a/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagSupport.java b/spec/src/main/java/jakarta/servlet/jsp/jstl/core/LoopTagSupport.java
similarity index 97%
rename from spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagSupport.java
rename to spec/src/main/java/jakarta/servlet/jsp/jstl/core/LoopTagSupport.java
index 5db8138..85e8603 100644
--- a/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagSupport.java
+++ b/spec/src/main/java/jakarta/servlet/jsp/jstl/core/LoopTagSupport.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package javax.servlet.jsp.jstl.core;
-
-import javax.el.ELContext;
-import javax.el.ValueExpression;
-import javax.el.VariableMapper;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.IterationTag;
-import javax.servlet.jsp.tagext.TagSupport;
-import javax.servlet.jsp.tagext.TryCatchFinally;
+package jakarta.servlet.jsp.jstl.core;
+
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
+import jakarta.el.VariableMapper;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.IterationTag;
+import jakarta.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.tagext.TryCatchFinally;
/**
* <p>Base support class to facilitate implementation of iteration tags.</p>
@@ -177,7 +177,7 @@ public abstract class LoopTagSupport
* @return the java.lang.Object to use in the next round of iteration
* @throws java.util.NoSuchElementException
* if next() is called but no new elements are available
- * @throws javax.servlet.jsp.JspTagException
+ * @throws jakarta.servlet.jsp.JspTagException
* for other, unexpected exceptions
*/
protected abstract Object next() throws JspTagException;
@@ -192,7 +192,7 @@ public abstract class LoopTagSupport
*
* @return <tt>true</tt> if there is at least one more item to iterate
* over, <tt>false</tt> otherwise
- * @throws javax.servlet.jsp.JspTagException
+ * @throws jakarta.servlet.jsp.JspTagException
*
* @see #next
*/
@@ -204,7 +204,7 @@ public abstract class LoopTagSupport
* Subclasses can assume that prepare() will be called once for
* each invocation of doStartTag() in the superclass.</p>
*
- * @throws javax.servlet.jsp.JspTagException
+ * @throws jakarta.servlet.jsp.JspTagException
*
*/
protected abstract void prepare() throws JspTagException;
diff --git a/spec/src/main/java/javax/servlet/jsp/jstl/fmt/JakartaInline.java b/spec/src/main/java/jakarta/servlet/jsp/jstl/fmt/JakartaInline.java
similarity index 97%
rename from spec/src/main/java/javax/servlet/jsp/jstl/fmt/JakartaInline.java
rename to spec/src/main/java/jakarta/servlet/jsp/jstl/fmt/JakartaInline.java
index 2e4107b..717c76e 100644
--- a/spec/src/main/java/javax/servlet/jsp/jstl/fmt/JakartaInline.java
+++ b/spec/src/main/java/jakarta/servlet/jsp/jstl/fmt/JakartaInline.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package javax.servlet.jsp.jstl.fmt;
+package jakarta.servlet.jsp.jstl.fmt;
import java.util.Enumeration;
import java.util.Locale;
@@ -23,10 +23,10 @@ import java.util.MissingResourceException;
import java.util.ResourceBundle;
import java.util.Vector;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.jstl.core.Config;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.jstl.core.Config;
class JakartaInline {
@@ -78,12 +78,12 @@ class JakartaInline {
* <p>Check if a match exists between the ordered set of preferred
* locales and the available locales, for the given base name.
* The set of preferred locales consists of a single locale
- * (if the <tt>javax.servlet.jsp.jstl.fmt.locale</tt> configuration
+ * (if the <tt>jakarta.servlet.jsp.jstl.fmt.locale</tt> configuration
* setting is present) or is equal to the client's preferred locales
* determined from the client's browser settings.
* <p>If no match was found in the previous step, check if a match
* exists between the fallback locale (given by the
- * <tt>javax.servlet.jsp.jstl.fmt.fallbackLocale</tt> configuration
+ * <tt>jakarta.servlet.jsp.jstl.fmt.fallbackLocale</tt> configuration
* setting) and the available locales, for the given base name.
*
* @param pageContext Page in which the resource bundle with the
@@ -317,7 +317,7 @@ class JakartaInline {
/*
* Stores the given locale in the response object of the given page
* context, and stores the locale's associated charset in the
- * javax.servlet.jsp.jstl.fmt.request.charset session attribute, which
+ * jakarta.servlet.jsp.jstl.fmt.request.charset session attribute, which
* may be used by the <requestEncoding> action in a page invoked by a
* form included in the response to set the request charset to the same as
* the response charset (this makes it possible for the container to
@@ -433,5 +433,5 @@ class JakartaInline {
// === END OF COPY FROM SetLocaleSupport TO SUPPORT BundleSupport ===
static final String REQUEST_CHAR_SET =
- "javax.servlet.jsp.jstl.fmt.request.charset";
+ "jakarta.servlet.jsp.jstl.fmt.request.charset";
}
diff --git a/spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocaleSupport.java b/spec/src/main/java/jakarta/servlet/jsp/jstl/fmt/LocaleSupport.java
similarity index 93%
rename from spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocaleSupport.java
rename to spec/src/main/java/jakarta/servlet/jsp/jstl/fmt/LocaleSupport.java
index 55563cd..b3844c6 100644
--- a/spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocaleSupport.java
+++ b/spec/src/main/java/jakarta/servlet/jsp/jstl/fmt/LocaleSupport.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package javax.servlet.jsp.jstl.fmt;
+package jakarta.servlet.jsp.jstl.fmt;
import java.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
/**
* Class which exposes the locale-determination logic for resource bundles
@@ -40,7 +40,7 @@ public class LocaleSupport {
* Retrieves the localized message corresponding to the given key.
* <p> The given key is looked up in the resource bundle of the default
* I18N localization context, which is retrieved from the
- * <tt>javax.servlet.jsp.jstl.fmt.localizationContext</tt> configuration
+ * <tt>jakarta.servlet.jsp.jstl.fmt.localizationContext</tt> configuration
* setting.
* <p> If the configuration setting is empty, or the default I18N
* localization context does not contain any resource bundle, or the given
@@ -84,7 +84,7 @@ public class LocaleSupport {
* <p> See the specification of the <fmt:message> action for a description
* of how parametric replacement is implemented.
* <p> The localized message is retrieved as in
- * {@link #getLocalizedMessage(javax.servlet.jsp.PageContext,java.lang.String) getLocalizedMessage(pageContext, key)}.
+ * {@link #getLocalizedMessage(jakarta.servlet.jsp.PageContext,java.lang.String) getLocalizedMessage(pageContext, key)}.
*
* @param pageContext the page in which to get the localized message
* corresponding to the given key
@@ -105,7 +105,7 @@ public class LocaleSupport {
* <p> See the specification of the <fmt:message> action for a description
* of how parametric replacement is implemented.
* <p> The localized message is retrieved as in
- * {@link #getLocalizedMessage(javax.servlet.jsp.PageContext,java.lang.String, java.lang.String) getLocalizedMessage(pageContext, key, basename)}.
+ * {@link #getLocalizedMessage(jakarta.servlet.jsp.PageContext,java.lang.String, java.lang.String) getLocalizedMessage(pageContext, key, basename)}.
*
* @param pageContext the page in which to get the localized message
* corresponding to the given key
diff --git a/spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocalizationContext.java b/spec/src/main/java/jakarta/servlet/jsp/jstl/fmt/LocalizationContext.java
similarity index 98%
rename from spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocalizationContext.java
rename to spec/src/main/java/jakarta/servlet/jsp/jstl/fmt/LocalizationContext.java
index 63d444a..d338036 100644
--- a/spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocalizationContext.java
+++ b/spec/src/main/java/jakarta/servlet/jsp/jstl/fmt/LocalizationContext.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package javax.servlet.jsp.jstl.fmt;
+package jakarta.servlet.jsp.jstl.fmt;
import java.util.Locale;
import java.util.ResourceBundle;
diff --git a/spec/src/main/java/javax/servlet/jsp/jstl/sql/Result.java b/spec/src/main/java/jakarta/servlet/jsp/jstl/sql/Result.java
similarity index 99%
rename from spec/src/main/java/javax/servlet/jsp/jstl/sql/Result.java
rename to spec/src/main/java/jakarta/servlet/jsp/jstl/sql/Result.java
index 04277c5..60b03e9 100644
--- a/spec/src/main/java/javax/servlet/jsp/jstl/sql/Result.java
+++ b/spec/src/main/java/jakarta/servlet/jsp/jstl/sql/Result.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package javax.servlet.jsp.jstl.sql;
+package jakarta.servlet.jsp.jstl.sql;
import java.util.SortedMap;
diff --git a/spec/src/main/java/javax/servlet/jsp/jstl/sql/ResultImpl.java b/spec/src/main/java/jakarta/servlet/jsp/jstl/sql/ResultImpl.java
similarity index 99%
rename from spec/src/main/java/javax/servlet/jsp/jstl/sql/ResultImpl.java
rename to spec/src/main/java/jakarta/servlet/jsp/jstl/sql/ResultImpl.java
index 493b3f6..d7901b5 100644
--- a/spec/src/main/java/javax/servlet/jsp/jstl/sql/ResultImpl.java
+++ b/spec/src/main/java/jakarta/servlet/jsp/jstl/sql/ResultImpl.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package javax.servlet.jsp.jstl.sql;
+package jakarta.servlet.jsp.jstl.sql;
import java.io.Serializable;
import java.sql.ResultSet;
diff --git a/spec/src/main/java/javax/servlet/jsp/jstl/sql/ResultSupport.java b/spec/src/main/java/jakarta/servlet/jsp/jstl/sql/ResultSupport.java
similarity index 95%
rename from spec/src/main/java/javax/servlet/jsp/jstl/sql/ResultSupport.java
rename to spec/src/main/java/jakarta/servlet/jsp/jstl/sql/ResultSupport.java
index b9fb265..11a33db 100644
--- a/spec/src/main/java/javax/servlet/jsp/jstl/sql/ResultSupport.java
+++ b/spec/src/main/java/jakarta/servlet/jsp/jstl/sql/ResultSupport.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package javax.servlet.jsp.jstl.sql;
+package jakarta.servlet.jsp.jstl.sql;
import java.sql.ResultSet;
import java.sql.SQLException;
/**
- * <p>Supports the creation of a javax.servlet.jsp.jstl.sql.Result object
+ * <p>Supports the creation of a jakarta.servlet.jsp.jstl.sql.Result object
* from a source java.sql.ResultSet object. A Result object makes it much
* easier for page authors to access and manipulate the data resulting
* from a SQL query.</p>
diff --git a/spec/src/main/java/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java b/spec/src/main/java/jakarta/servlet/jsp/jstl/sql/SQLExecutionTag.java
similarity index 98%
rename from spec/src/main/java/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java
rename to spec/src/main/java/jakarta/servlet/jsp/jstl/sql/SQLExecutionTag.java
index 25fc4d2..20d94c9 100644
--- a/spec/src/main/java/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java
+++ b/spec/src/main/java/jakarta/servlet/jsp/jstl/sql/SQLExecutionTag.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package javax.servlet.jsp.jstl.sql;
+package jakarta.servlet.jsp.jstl.sql;
/**
* <p>This interface allows tag handlers implementing it to receive
diff --git a/spec/src/main/java/javax/servlet/jsp/jstl/tlv/PageParser.java b/spec/src/main/java/jakarta/servlet/jsp/jstl/tlv/PageParser.java
similarity index 97%
rename from spec/src/main/java/javax/servlet/jsp/jstl/tlv/PageParser.java
rename to spec/src/main/java/jakarta/servlet/jsp/jstl/tlv/PageParser.java
index 57f75dc..bdcd3b1 100644
--- a/spec/src/main/java/javax/servlet/jsp/jstl/tlv/PageParser.java
+++ b/spec/src/main/java/jakarta/servlet/jsp/jstl/tlv/PageParser.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.servlet.jsp.jstl.tlv;
+package jakarta.servlet.jsp.jstl.tlv;
import java.io.IOException;
import java.io.InputStream;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import javax.servlet.jsp.tagext.PageData;
+import jakarta.servlet.jsp.tagext.PageData;
import javax.xml.XMLConstants;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
diff --git a/spec/src/main/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java b/spec/src/main/java/jakarta/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
similarity index 96%
rename from spec/src/main/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
rename to spec/src/main/java/jakarta/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
index e6fe169..a153827 100644
--- a/spec/src/main/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
+++ b/spec/src/main/java/jakarta/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.servlet.jsp.jstl.tlv;
+package jakarta.servlet.jsp.jstl.tlv;
import java.io.IOException;
import java.util.HashSet;
@@ -22,9 +22,9 @@ import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
-import javax.servlet.jsp.tagext.PageData;
-import javax.servlet.jsp.tagext.TagLibraryValidator;
-import javax.servlet.jsp.tagext.ValidationMessage;
+import jakarta.servlet.jsp.tagext.PageData;
+import jakarta.servlet.jsp.tagext.TagLibraryValidator;
+import jakarta.servlet.jsp.tagext.ValidationMessage;
import javax.xml.parsers.ParserConfigurationException;
import org.xml.sax.Attributes;
diff --git a/spec/src/main/java/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java b/spec/src/main/java/jakarta/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
similarity index 98%
rename from spec/src/main/java/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
rename to spec/src/main/java/jakarta/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
index 882baed..0bd39fc 100644
--- a/spec/src/main/java/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
+++ b/spec/src/main/java/jakarta/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.servlet.jsp.jstl.tlv;
+package jakarta.servlet.jsp.jstl.tlv;
import java.io.IOException;
import java.util.Map;
-import javax.servlet.jsp.tagext.PageData;
-import javax.servlet.jsp.tagext.TagLibraryValidator;
-import javax.servlet.jsp.tagext.ValidationMessage;
+import jakarta.servlet.jsp.tagext.PageData;
+import jakarta.servlet.jsp.tagext.TagLibraryValidator;
+import jakarta.servlet.jsp.tagext.ValidationMessage;
import javax.xml.parsers.ParserConfigurationException;
import org.xml.sax.Attributes;
diff --git a/spec/src/test/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLVTest.java b/spec/src/test/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLVTest.java
index 18f4e16..f43c3a9 100644
--- a/spec/src/test/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLVTest.java
+++ b/spec/src/test/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLVTest.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package javax.servlet.jsp.jstl.tlv;
+package jakarta.servlet.jsp.jstl.tlv;
import java.io.ByteArrayInputStream;
import java.io.UnsupportedEncodingException;
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.jsp.tagext.PageData;
-import javax.servlet.jsp.tagext.ValidationMessage;
+import jakarta.servlet.jsp.tagext.PageData;
+import jakarta.servlet.jsp.tagext.ValidationMessage;
import org.junit.Before;
import org.junit.Ignore;
diff --git a/standard-examples/pom.xml b/standard-examples/pom.xml
index 5b38bfb..3dedaa4 100644
--- a/standard-examples/pom.xml
+++ b/standard-examples/pom.xml
@@ -47,18 +47,18 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>jakarta.servlet.jsp</groupId>
+ <artifactId>jakarta.servlet.jsp-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/startup/Init.java b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/startup/Init.java
index 6919fc8..e00f146 100644
--- a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/startup/Init.java
+++ b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/startup/Init.java
@@ -20,8 +20,8 @@ package org.apache.taglibs.standard.examples.startup;
import java.util.Enumeration;
import java.util.Hashtable;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
import org.apache.taglibs.standard.examples.beans.Customers;
diff --git a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/CustomerFmtTag.java b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/CustomerFmtTag.java
index 277a7eb..139a57d 100644
--- a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/CustomerFmtTag.java
+++ b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/CustomerFmtTag.java
@@ -19,9 +19,9 @@ package org.apache.taglibs.standard.examples.taglib;
import java.io.IOException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.TagSupport;
import org.apache.taglibs.standard.examples.beans.Customer;
diff --git a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/DefaultLocaleTag.java b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/DefaultLocaleTag.java
index f3d430a..ba5c894 100644
--- a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/DefaultLocaleTag.java
+++ b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/DefaultLocaleTag.java
@@ -19,8 +19,8 @@ package org.apache.taglibs.standard.examples.taglib;
import java.util.Locale;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.jstl.core.ConditionalTagSupport;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.jstl.core.ConditionalTagSupport;
/**
* <p>Tag handler for <locales>
diff --git a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/EscapeHtmlTag.java b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/EscapeHtmlTag.java
index a075e78..2b36c7b 100644
--- a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/EscapeHtmlTag.java
+++ b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/EscapeHtmlTag.java
@@ -21,9 +21,9 @@ import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
import org.apache.taglibs.standard.examples.util.Util;
diff --git a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/EvenTag.java b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/EvenTag.java
index 80c4bd3..b07b30a 100644
--- a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/EvenTag.java
+++ b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/EvenTag.java
@@ -17,10 +17,10 @@
package org.apache.taglibs.standard.examples.taglib;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.jstl.core.LoopTag;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.jstl.core.LoopTag;
+import jakarta.servlet.jsp.tagext.TagSupport;
/**
* <p>Tag handler for <odd>
diff --git a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/FileTag.java b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/FileTag.java
index 78c8b7c..4106c5e 100644
--- a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/FileTag.java
+++ b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/FileTag.java
@@ -22,8 +22,8 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.TagSupport;
/**
* <p>Tag handler for <file>
diff --git a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/Functions.java b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/Functions.java
index a2a6627..5bf0e37 100644
--- a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/Functions.java
+++ b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/Functions.java
@@ -19,7 +19,7 @@ package org.apache.taglibs.standard.examples.taglib;
import java.lang.reflect.Array;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
/**
* <p>Exmaples taglib Functions</p>
diff --git a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/LocalesTag.java b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/LocalesTag.java
index b4f3777..74ac2be 100644
--- a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/LocalesTag.java
+++ b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/LocalesTag.java
@@ -19,8 +19,8 @@ package org.apache.taglibs.standard.examples.taglib;
import java.util.Locale;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.jstl.core.LoopTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.jstl.core.LoopTagSupport;
/**
* <p>Tag handler for <locales>
diff --git a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/NullAttributeException.java b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/NullAttributeException.java
index 747ee56..779736c 100644
--- a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/NullAttributeException.java
+++ b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/NullAttributeException.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.examples.taglib;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
/**
* <p>NullAttributeException is a JspTagException that will be thrown
diff --git a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/OddTag.java b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/OddTag.java
index c7140a9..62fb401 100644
--- a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/OddTag.java
+++ b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/OddTag.java
@@ -17,10 +17,10 @@
package org.apache.taglibs.standard.examples.taglib;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.jstl.core.LoopTag;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.jstl.core.LoopTag;
+import jakarta.servlet.jsp.tagext.TagSupport;
/**
* <p>Tag handler for <odd>
diff --git a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/ResourceTag.java b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/ResourceTag.java
index cf73694..5dd8ef6 100644
--- a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/ResourceTag.java
+++ b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/ResourceTag.java
@@ -22,12 +22,12 @@ import java.io.PrintWriter;
import java.io.Reader;
import java.io.Writer;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletResponseWrapper;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletResponseWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.TagSupport;
import org.apache.taglibs.standard.examples.util.IOBean;
import org.apache.taglibs.standard.examples.util.ServletResponseWrapperForWriter;
diff --git a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/UsCustomerTag.java b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/UsCustomerTag.java
index f55da79..5b4a54a 100644
--- a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/UsCustomerTag.java
+++ b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/UsCustomerTag.java
@@ -17,9 +17,9 @@
package org.apache.taglibs.standard.examples.taglib;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.jstl.core.ConditionalTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.jstl.core.ConditionalTagSupport;
import org.apache.taglibs.standard.examples.beans.Customer;
diff --git a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/util/IOBean.java b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/util/IOBean.java
index f4958d8..a1a08d8 100644
--- a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/util/IOBean.java
+++ b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/util/IOBean.java
@@ -22,7 +22,7 @@ import java.io.StringReader;
import java.io.StringWriter;
import java.io.Writer;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
/**
* <p>String repository for Reader/Writer.
diff --git a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java
index b37d3b1..315c0d8 100644
--- a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java
+++ b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java
@@ -18,9 +18,9 @@
package org.apache.taglibs.standard.examples.util;
import java.io.PrintWriter;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
/**
* ServletResponseWrapper used for the the generation of
diff --git a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/util/Util.java b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/util/Util.java
index 08e69bd..d11ccdb 100644
--- a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/util/Util.java
+++ b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/util/Util.java
@@ -25,7 +25,7 @@ import java.io.Reader;
import java.io.StringReader;
import java.io.Writer;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
/**
* <p>Utility class for examples webapp.
diff --git a/standard-test/pom.xml b/standard-test/pom.xml
index 7e16116..cc9fda8 100644
--- a/standard-test/pom.xml
+++ b/standard-test/pom.xml
@@ -71,20 +71,18 @@
<!-- dependencies of the above -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <groupId>jakarta.servlet.jsp</groupId>
+ <artifactId>jakarta.servlet.jsp-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
diff --git a/standard-test/src/test/java/org/apache/taglibs/standard/functions/TestEndsWith.java b/standard-test/src/test/java/org/apache/taglibs/standard/functions/TestEndsWith.java
index 8c01d4f..b730e11 100644
--- a/standard-test/src/test/java/org/apache/taglibs/standard/functions/TestEndsWith.java
+++ b/standard-test/src/test/java/org/apache/taglibs/standard/functions/TestEndsWith.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.functions;
-import javax.servlet.jsp.*;
+import jakarta.servlet.jsp.*;
import org.apache.cactus.*;
import org.apache.taglibs.standard.testutil.TestUtil;
diff --git a/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test34109.java b/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test34109.java
index cb15bc8..4a29dab 100644
--- a/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test34109.java
+++ b/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test34109.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.core;
-import javax.servlet.jsp.*;
+import jakarta.servlet.jsp.*;
import org.apache.cactus.*;
import org.apache.taglibs.standard.testutil.TestUtil;
diff --git a/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java b/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java
index a592637..ef6c7cc 100644
--- a/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java
+++ b/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java
@@ -18,7 +18,7 @@
package org.apache.taglibs.standard.tag.el.core;
import java.net.*;
-import javax.servlet.http.*;
+import jakarta.servlet.http.*;
import org.apache.cactus.*;
import org.apache.taglibs.standard.testutil.TestUtil;
diff --git a/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestOutTag.java b/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestOutTag.java
index 8799a63..f31c308 100644
--- a/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestOutTag.java
+++ b/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestOutTag.java
@@ -20,7 +20,7 @@ import org.apache.cactus.ServletTestCase;
import org.apache.cactus.WebResponse;
import org.apache.taglibs.standard.testutil.TestUtil;
-import javax.servlet.RequestDispatcher;
+import jakarta.servlet.RequestDispatcher;
import java.io.StringReader;
/**
diff --git a/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestSetTag.java b/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestSetTag.java
index 506a824..6bf318f 100644
--- a/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestSetTag.java
+++ b/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestSetTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.core;
-import javax.servlet.jsp.*;
+import jakarta.servlet.jsp.*;
import org.apache.cactus.*;
import org.apache.taglibs.standard.testutil.TestUtil;
diff --git a/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.java b/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.java
index 69a9a2b..62f0f35 100644
--- a/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.java
+++ b/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.fmt;
-import javax.servlet.jsp.*;
+import jakarta.servlet.jsp.*;
import org.apache.cactus.*;
import org.apache.taglibs.standard.testutil.TestUtil;
diff --git a/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test33054.java b/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test33054.java
index 0ff41c1..6a61ddb 100644
--- a/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test33054.java
+++ b/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test33054.java
@@ -18,7 +18,7 @@
package org.apache.taglibs.standard.tag.el.sql;
import java.sql.*;
-import javax.servlet.jsp.*;
+import jakarta.servlet.jsp.*;
import org.apache.cactus.*;
import org.apache.taglibs.standard.testutil.TestUtil;
diff --git a/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test43831.java b/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test43831.java
index d37f8a8..bb2cfdd 100644
--- a/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test43831.java
+++ b/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test43831.java
@@ -18,7 +18,7 @@
package org.apache.taglibs.standard.tag.el.sql;
import java.sql.*;
-import javax.servlet.jsp.*;
+import jakarta.servlet.jsp.*;
import org.apache.cactus.*;
import org.apache.taglibs.standard.testutil.TestUtil;
diff --git a/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test30068.java b/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test30068.java
index bd453f1..16bb9f2 100644
--- a/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test30068.java
+++ b/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test30068.java
@@ -17,7 +17,7 @@
package org.apache.taglibs.standard.tag.el.xml;
-import javax.servlet.jsp.*;
+import jakarta.servlet.jsp.*;
import org.apache.cactus.*;
import org.apache.taglibs.standard.testutil.TestUtil;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org