(tomcat) branch 9.0.x updated: Fix Jakarta references

[remm]

This is an automated email from the ASF dual-hosted git repository.

rmaucher pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new be962064ec Fix Jakarta references
be962064ec is described below

commit be962064eccb9766b4a8f621defee893c74f1c7a
Author: remm <r...@apache.org>
AuthorDate: Thu May 7 10:17:18 2026 +0200

    Fix Jakarta references
    
    The EL one should only have a perf impact.
---
 java/javax/el/CompositeELResolver.java                 | 4 ++--
 java/org/apache/catalina/util/ServerInfo.java          | 4 ++--
 java/org/apache/jasper/runtime/HttpJspBase.java        | 2 +-
 java/org/apache/naming/factory/MailSessionFactory.java | 2 +-
 java/org/apache/naming/factory/SendMailFactory.java    | 2 +-
 webapps/docs/changelog.xml                             | 7 +++++++
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/java/javax/el/CompositeELResolver.java 
b/java/javax/el/CompositeELResolver.java
index 2280f9a805..112b979e80 100644
--- a/java/javax/el/CompositeELResolver.java
+++ b/java/javax/el/CompositeELResolver.java
@@ -45,8 +45,8 @@ public class CompositeELResolver extends ELResolver {
         
KNOWN_NON_TYPE_CONVERTING_RESOLVERS.add(ResourceBundleELResolver.class.getName());
         
KNOWN_NON_TYPE_CONVERTING_RESOLVERS.add(StaticFieldELResolver.class.getName());
         // JSP API Resolvers - referenced by name to avoid creating dependency
-        
KNOWN_NON_TYPE_CONVERTING_RESOLVERS.add("jakarta.servlet.jsp.el.ImplicitObjectELResolver");
-        
KNOWN_NON_TYPE_CONVERTING_RESOLVERS.add("jakarta.servlet.jsp.el.ScopedAttributeELResolver");
+        
KNOWN_NON_TYPE_CONVERTING_RESOLVERS.add("javax.servlet.jsp.el.ImplicitObjectELResolver");
+        
KNOWN_NON_TYPE_CONVERTING_RESOLVERS.add("javax.servlet.jsp.el.ScopedAttributeELResolver");
         // Tomcat internal resolvers - referenced by name to avoid creating 
dependency
         
KNOWN_NON_TYPE_CONVERTING_RESOLVERS.add("org.apache.jasper.el.JasperELResolver$GraalBeanELResolver");
         
KNOWN_NON_TYPE_CONVERTING_RESOLVERS.add("org.apache.el.stream.StreamELResolverImpl");
diff --git a/java/org/apache/catalina/util/ServerInfo.java 
b/java/org/apache/catalina/util/ServerInfo.java
index 3dcc1184f0..3093e38d2b 100644
--- a/java/org/apache/catalina/util/ServerInfo.java
+++ b/java/org/apache/catalina/util/ServerInfo.java
@@ -278,10 +278,10 @@ public class ServerInfo {
                 String bundleName = 
manifest.getMainAttributes().getValue("Bundle-SymbolicName");
                 if (bundleName != null) {
                     // Tomcat core JARs have Bundle-SymbolicName starting with 
org.apache.tomcat,
-                    // org.apache.catalina, or jakarta.
+                    // org.apache.catalina, or javax.
                     if (bundleName.startsWith("org.apache.tomcat") ||
                             bundleName.startsWith("org.apache.catalina") ||
-                            bundleName.startsWith("jakarta.")) {
+                            bundleName.startsWith("javax.")) {
                         return true;
                     }
                 }
diff --git a/java/org/apache/jasper/runtime/HttpJspBase.java 
b/java/org/apache/jasper/runtime/HttpJspBase.java
index 0299490f61..d88b8c5a57 100644
--- a/java/org/apache/jasper/runtime/HttpJspBase.java
+++ b/java/org/apache/jasper/runtime/HttpJspBase.java
@@ -70,7 +70,7 @@ public abstract class HttpJspBase extends HttpServlet 
implements HttpJspPage {
     }
 
     /**
-     * Sub-classes may override this method to perform initialization. Called 
from {@link #init(jakarta.servlet.ServletConfig)}.
+     * Sub-classes may override this method to perform initialization. Called 
from {@link #init(javax.servlet.ServletConfig)}.
      */
     public void _jspInit() {
     }
diff --git a/java/org/apache/naming/factory/MailSessionFactory.java 
b/java/org/apache/naming/factory/MailSessionFactory.java
index e1ccfc9b3e..a86504e68e 100644
--- a/java/org/apache/naming/factory/MailSessionFactory.java
+++ b/java/org/apache/naming/factory/MailSessionFactory.java
@@ -49,7 +49,7 @@ import javax.naming.spi.ObjectFactory;
  * <pre>
  * &lt;Resource name="mail/smtp"
  *           auth="CONTAINER"
- *           type="jakarta.mail.Session"
+ *           type="javax.mail.Session"
  *           mail.smtp.host="mail.mycompany.com"
  *           /&gt;
  * </pre>
diff --git a/java/org/apache/naming/factory/SendMailFactory.java 
b/java/org/apache/naming/factory/SendMailFactory.java
index e4e26aabd0..dcac4ca916 100644
--- a/java/org/apache/naming/factory/SendMailFactory.java
+++ b/java/org/apache/naming/factory/SendMailFactory.java
@@ -45,7 +45,7 @@ import org.apache.tomcat.util.ExceptionUtils;
  * <pre>
  * &lt;Resource name="mail/send"
  *           auth="CONTAINER"
- *           type="jakarta.mail.internet.MimePartDataSource"
+ *           type="javax.mail.internet.MimePartDataSource"
  *           factory="org.apache.naming.factory.SendMailFactory"
  *           mail.smtp.host="your.smtp.host"
  *           mail.smtp.user="someuser"
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0eb0193139..373d7ebaae 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -116,6 +116,13 @@
       </add>
     </changelog>
   </subsection>
+  <subsection name="Other">
+    <changelog>
+      <fix>
+        Wrong references to jakarta instead of javax. (remm)
+      </fix>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 9.0.118 (remm)" rtext="release in progress">
   <subsection name="Catalina">


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org