Add Jakarta EE 11 schema to the digester

Author: markt-asf

java/org/apache/tomcat/util/descriptor/DigesterFactory.java

@@ -145,6 +145,14 @@ public class DigesterFactory {
         addSelf(systemIds, "jakartaee_web_services_2_0.xsd");
         addSelf(systemIds, "jakartaee_web_services_client_2_0.xsd");
 
+        // from JakartaEE 11
+        add(systemIds, XmlIdentifiers.WEB_61_XSD, locationFor("web-app_6_1.xsd"));
+        add(systemIds, XmlIdentifiers.WEB_FRAGMENT_61_XSD, locationFor("web-fragment_6_1.xsd"));
+        add(systemIds, XmlIdentifiers.TLD_40_XSD, locationFor("web-jsptaglibrary_4_0.xsd"));
+        addSelf(systemIds, "web-common_6_1.xsd");
+        addSelf(systemIds, "jakartaee_11.xsd");
+        addSelf(systemIds, "jsp_4_0.xsd");
+
         SERVLET_API_PUBLIC_IDS = Collections.unmodifiableMap(publicIds);
         SERVLET_API_SYSTEM_IDS = Collections.unmodifiableMap(systemIds);
     }

java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java

@@ -91,6 +91,12 @@ public final class XmlIdentifiers {
     public static final String WEB_FRAGMENT_60_XSD = JAKARTAEE_10_NS + "/web-fragment_6_0.xsd";
     public static final String TLD_31_XSD = JAKARTAEE_10_NS + "/web-jsptaglibrary_3_1.xsd";
 
+    // from Jakarta EE 11
+    public static final String JAKARTAEE_11_NS = JAKARTAEE_10_NS;
+    public static final String WEB_61_XSD = JAKARTAEE_11_NS + "/web-app_6_1.xsd";
+    public static final String WEB_FRAGMENT_61_XSD = JAKARTAEE_11_NS + "/web-fragment_6_1.xsd";
+    public static final String TLD_40_XSD = JAKARTAEE_11_NS + "/web-jsptaglibrary_4_0.xsd";
+
     private XmlIdentifiers() {
     }
 }

java/org/apache/tomcat/util/descriptor/web/WebXml.java

@@ -766,6 +766,9 @@ public String toXml() {
             } else if ("6.0".equals(version)) {
                 javaeeNamespace = XmlIdentifiers.JAKARTAEE_10_NS;
                 webXmlSchemaLocation = XmlIdentifiers.WEB_60_XSD;
+            } else if ("6.1".equals(version)) {
+                javaeeNamespace = XmlIdentifiers.JAKARTAEE_11_NS;
+                webXmlSchemaLocation = XmlIdentifiers.WEB_61_XSD;
             }
             sb.append("<web-app xmlns=\"");
             sb.append(javaeeNamespace);