[#1802] Switch pax-web-tomcat-common from javax to jakarta

ops4j · Jun 12, 2023 · fcd1dc1 · fcd1dc1
1 parent c431380
commit fcd1dc1
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 11 deletions.
diff --git a/pax-web-tomcat-common/pom.xml b/pax-web-tomcat-common/pom.xml
@@ -44,23 +44,18 @@
 				<configuration>
 					<instructions>
 						<DynamicImport-Package>
-							javax.servlet.jsp,
-							javax.servlet.jsp.*
+							jakarta.servlet.jsp,
+							jakarta.servlet.jsp.*
 						</DynamicImport-Package>
 						<Import-Package>
-							<!-- ranges indicate Servlet API 3.1+ (JavaEE 7+) -->
-							javax.servlet;version="[3.1,5)",
-							javax.servlet.annotation;version="[3.1,5)",
-							javax.servlet.descriptor;version="[3.1,5)",
+							<!-- ranges indicate Servlet API 6.0+ (JakartaEE 10+) -->
+							jakarta.servlet;version="[6,7)",
+							jakarta.servlet.annotation;version="[6,7)",
+							jakarta.servlet.descriptor;version="[6,7)",
 
 							<!-- from pax-api -->
 							org.ops4j.pax.web.service;version="${pax-web.osgi.version}",
 
-							<!-- from pax-web-jsp -->
-<!--							javax.servlet.jsp;version="2.3";resolution:=optional,-->
-<!--							javax.servlet.jsp.el;version="2.3";resolution:=optional,-->
-<!--							javax.servlet.jsp.tagext;version="2.3";resolution:=optional,-->
-
 							<!-- from pax-logging-api -->
 							org.apache.juli.logging,
 

diff --git a/pax-web-tomcat-common/src/main/java/org/apache/tomcat/util/descriptor/DigesterFactory.java b/pax-web-tomcat-common/src/main/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
@@ -111,6 +111,26 @@ public class DigesterFactory {
         addSelf(systemIds, "web-common_4_0.xsd");
         addSelf(systemIds, "javaee_8.xsd");
 
+        // from JakartaEE 9
+        add(systemIds, XmlIdentifiers.WEB_50_XSD, locationFor("web-app_5_0.xsd"));
+        add(systemIds, XmlIdentifiers.WEB_FRAGMENT_50_XSD, locationFor("web-fragment_5_0.xsd"));
+        add(systemIds, XmlIdentifiers.TLD_30_XSD, locationFor("web-jsptaglibrary_3_0.xsd"));
+        addSelf(systemIds, "web-common_5_0.xsd");
+        addSelf(systemIds, "jakartaee_9.xsd");
+        addSelf(systemIds, "jsp_3_0.xsd");
+        addSelf(systemIds, "jakartaee_web_services_2_0.xsd");
+        addSelf(systemIds, "jakartaee_web_services_client_2_0.xsd");
+
+        // from JakartaEE 10
+        add(systemIds, XmlIdentifiers.WEB_60_XSD, locationFor("web-app_6_0.xsd"));
+        add(systemIds, XmlIdentifiers.WEB_FRAGMENT_60_XSD, locationFor("web-fragment_6_0.xsd"));
+        add(systemIds, XmlIdentifiers.TLD_31_XSD, locationFor("web-jsptaglibrary_3_1.xsd"));
+        addSelf(systemIds, "web-common_6_0.xsd");
+        addSelf(systemIds, "jakartaee_10.xsd");
+        addSelf(systemIds, "jsp_3_1.xsd");
+        addSelf(systemIds, "jakartaee_web_services_2_0.xsd");
+        addSelf(systemIds, "jakartaee_web_services_client_2_0.xsd");
+
         SERVLET_API_PUBLIC_IDS = Collections.unmodifiableMap(publicIds);
         SERVLET_API_SYSTEM_IDS = Collections.unmodifiableMap(systemIds);
     }