From fcd1dc1f5414c129b53dc611d0758875535422d0 Mon Sep 17 00:00:00 2001
From: Grzegorz Grzybek <gr.grzybek@gmail.com>
Date: Mon, 12 Jun 2023 15:58:19 +0200
Subject: [PATCH] [#1802] Switch pax-web-tomcat-common from javax to jakarta

---
 pax-web-tomcat-common/pom.xml                 | 17 ++++++----------
 .../util/descriptor/DigesterFactory.java      | 20 +++++++++++++++++++
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/pax-web-tomcat-common/pom.xml b/pax-web-tomcat-common/pom.xml
index 58b71c6476..1a51a07513 100644
--- 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
index cfaba74a2c..ac96c74401 100644
--- 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);
     }