[565454] Include Jakarta EE 9 web Schemas and DTDs in XML Catalog*
diff --git a/web/bundles/org.eclipse.jst.standard.schemas/.settings/org.eclipse.pde.prefs b/web/bundles/org.eclipse.jst.standard.schemas/.settings/org.eclipse.pde.prefs
index d4ac9ad..a371f21 100644
--- a/web/bundles/org.eclipse.jst.standard.schemas/.settings/org.eclipse.pde.prefs
+++ b/web/bundles/org.eclipse.jst.standard.schemas/.settings/org.eclipse.pde.prefs
@@ -1,15 +1,36 @@
-#Sat Apr 28 09:28:31 EDT 2007
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
 compilers.incompatible-environment=1
 compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
 compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.exec-env-too-low=1
+compilers.p.internal=1
 compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=2
+compilers.p.missing-version-require-bundle=2
 compilers.p.no-required-att=0
+compilers.p.no.automatic.module=1
 compilers.p.not-externalized-att=1
+compilers.p.service.component.without.lazyactivation=1
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
 compilers.p.unresolved-ex-points=0
 compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
 compilers.use-project=true
 eclipse.preferences.version=1
diff --git a/web/bundles/org.eclipse.jst.standard.schemas/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.jst.standard.schemas/META-INF/MANIFEST.MF
index 4ccea03..e9d0173 100644
--- a/web/bundles/org.eclipse.jst.standard.schemas/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.jst.standard.schemas/META-INF/MANIFEST.MF
@@ -2,6 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.jst.standard.schemas;singleton:=true
-Bundle-Version: 1.2.300.qualifier
+Bundle-Version: 1.2.400.qualifier
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
+Require-Bundle: jakarta.servlet;bundle-version="5.0.0"
diff --git a/web/bundles/org.eclipse.jst.standard.schemas/plugin.xml b/web/bundles/org.eclipse.jst.standard.schemas/plugin.xml
index 47e5273..907ba42 100644
--- a/web/bundles/org.eclipse.jst.standard.schemas/plugin.xml
+++ b/web/bundles/org.eclipse.jst.standard.schemas/plugin.xml
@@ -44,6 +44,9 @@
             <uri
                 name="http://xmlns.jcp.org/xml/ns/javaee/application_8.xsd"
                 uri="dtdsAndSchemas/application_8.xsd" />
+            <uri
+                name="https://jakarta.ee/xml/ns/jakartaee/application_9.xsd"
+                uri="https://jakarta.ee/xml/ns/jakartaee/application_9.xsd" />
 
 
             <public
@@ -78,6 +81,9 @@
             <uri
                 name="http://xmlns.jcp.org/xml/ns/javaee/application-client_8.xsd"
                 uri="dtdsAndSchemas/application-client_8.xsd" />
+            <uri
+                name="https://jakarta.ee/xml/ns/jakartaee/application-client_9.xsd"
+                uri="https://jakarta.ee/xml/ns/jakartaee/application-client_9.xsd" />
 
 		    <uri
                 name="http://xmlns.jcp.org/xml/ns/javaee/batchXML_1_0.xsd"
@@ -85,6 +91,9 @@
             <uri
                 name="http://xmlns.jcp.org/xml/ns/javaee/jobXML_1_0.xsd"
                 uri="dtdsAndSchemas/jobXML_1_0.xsd" />
+            <uri
+                name="https://jakarta.ee/xml/ns/jakartaee/jobXML_2_0.xsd"
+                uri="https://jakarta.ee/xml/ns/jakartaee/jobXML_2_0.xsd" />
 
            <uri
                name="http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"
@@ -98,6 +107,10 @@
            <uri
                name="http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
                uri="dtdsAndSchemas/beans_2_0.xsd"/>
+           <uri
+               name="https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"
+               uri="https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"/>
+
 
            <uri
                name="http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd"
@@ -105,6 +118,9 @@
            <uri
                name="http://xmlns.jcp.org/xml/ns/jaxb/bindingschema_2_0.xsd"
                uri="dtdsAndSchemas/bindingschema_2_0.xsd"/>
+           <uri
+               name="https://jakarta.ee/xml/ns/jaxb/bindingschema_3_0.xsd"
+               uri="https://jakarta.ee/xml/ns/jaxb/bindingschema_3_0.xsd"/>
 
 
             <public
@@ -126,6 +142,9 @@
             <uri
                 name="http://xmlns.jcp.org/xml/ns/javaee/connector_1_7.xsd"
                 uri="dtdsAndSchemas/connector_1_7.xsd" />
+            <uri
+                name="https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+                uri="https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd" />
 
 
             <public
@@ -157,6 +176,9 @@
             <uri
                 name="http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd"
                 uri="dtdsAndSchemas/ejb-jar_3_2.xsd" />
+            <uri
+                name="https://jakarta.ee/xml/ns/jakartaee/ejb-jar_4_0.xsd"
+                uri="https://jakarta.ee/xml/ns/jakartaee/ejb-jar_4_0.xsd" />
 
 
             <uri
@@ -186,6 +208,9 @@
             <uri
                 name="http://xmlns.jcp.org/xml/ns/javaee/javaee_8.xsd"
                 uri="dtdsAndSchemas/javaee_8.xsd" />
+            <uri
+                name="https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd"
+                uri="platform:/plugin/jakarta.servlet/jakarta/servlet/resources/jakartaee_9.xsd" />
 
             <uri
                 name="http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
@@ -222,7 +247,10 @@
             <uri
                 name="http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_1_4.xsd"
                 uri="dtdsAndSchemas/javaee_web_services_1_4.xsd" />
-                
+            <uri
+                name="https://jakarta.ee/xml/ns/jakartaee/jakartaee_web_services_2_0.xsd"
+                uri="platform:/plugin/jakarta.servlet/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd" />
+
 
             <uri
                 name="http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"
@@ -248,7 +276,10 @@
             <uri
                 name="http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_client_1_4.xsd"
                 uri="dtdsAndSchemas/javaee_web_services_client_1_4.xsd" />
-                
+            <uri
+                name="https://jakarta.ee/xml/ns/jakartaee/jakartaee_web_services_client_2_0.xsd"
+                uri="platform:/plugin/jakarta.servlet/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd" />
+
 
             <uri
                 name="http://java.sun.com/xml/ns/j2ee/jsp_2_0.xsd"
@@ -271,10 +302,17 @@
             <uri
                 name="http://xmlns.jcp.org/xml/ns/javaee/jsp_2_3.xsd"
                 uri="dtdsAndSchemas/jsp_2_3.xsd" />
-                
+            <uri
+                name="https://jakarta.ee/xml/ns/jakartaee/jsp_3_0.xsd"
+                uri="platform:/plugin/jakarta.servlet/jakarta/servlet/resources/jsp_3_0.xsd" />
+
+
             <uri
                 name="http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd"
                 uri="dtdsAndSchemas/permissions_7.xsd" />
+            <uri
+                name="https://jakarta.ee/xml/ns/jakartaee/permissions_9.xsd"
+                uri="https://jakarta.ee/xml/ns/jakartaee/permissions_9.xsd" />
 
 
             <uri
@@ -295,6 +333,9 @@
             <uri
                 name="http://xmlns.jcp.org/xml/ns/persistence/orm_2_2.xsd"
                 uri="dtdsAndSchemas/orm_2_2.xsd" />
+            <uri
+                name="https://jakarta.ee/xml/ns/persistence/orm_3_0.xsd"
+                uri="https://jakarta.ee/xml/ns/persistence/orm_3_0.xsd" />
 
 
             <uri
@@ -315,6 +356,9 @@
             <uri
                 name="http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd"
                 uri="dtdsAndSchemas/persistence_2_2.xsd" />
+            <uri
+                name="https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
+                uri="https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" />
 
 
             <uri
@@ -327,6 +371,9 @@
                 name="http://xmlns.jcp.org/xml/ns/validation/configuration/validation-configuration-2.0.xsd"
                 uri="dtdsAndSchemas/validation-configuration-2.0.xsd"/>
             <uri
+                name="https://jakarta.ee/xml/ns/validation/validation-configuration-3.0.xsd"
+                uri="https://jakarta.ee/xml/ns/validation/validation-configuration-3.0.xsd"/>
+            <uri
                 name="http://www.jboss.org/xml/ns/javax/validation/mapping/validation-mapping-1.0.xsd"
                 uri="dtdsAndSchemas/validation-mapping-1.0.xsd"/>
             <uri
@@ -335,6 +382,9 @@
             <uri
                 name="http://xmlns.jcp.org/xml/ns/validation/mapping/validation-mapping-2.0.xsd"
                 uri="dtdsAndSchemas/validation-mapping-2.0.xsd"/>
+            <uri
+                name="https://jakarta.ee/xml/ns/validation/validation-mapping-3.0.xsd"
+                uri="https://jakarta.ee/xml/ns/validation/validation-mapping-3.0.xsd"/>
 
 
             <public
@@ -369,6 +419,9 @@
             <uri
                 name="http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
                 uri="dtdsAndSchemas/web-app_4_0.xsd" />
+            <uri
+                name="https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
+                uri="platform:/plugin/jakarta.servlet/jakarta/servlet/resources/web-app_5_0.xsd" />
                 
             <uri
                 name="http://java.sun.com/xml/ns/javaee/web-common_3_0.xsd"
@@ -382,6 +435,9 @@
             <uri
                 name="http://xmlns.jcp.org/xml/ns/javaee/web-common_4_0.xsd"
                 uri="dtdsAndSchemas/web-common_4_0.xsd" />
+            <uri
+                name="https://jakarta.ee/xml/ns/jakartaee/web-common_5_0.xsd"
+                uri="platform:/plugin/jakarta.servlet/jakarta/servlet/resources/web-common_5_0.xsd" />
 
             <public
                 publicId="-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
@@ -398,6 +454,9 @@
             <uri
                 name="http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_3.xsd"
                 uri="dtdsAndSchemas/web-facelettaglibrary_2_3.xsd"/>  
+            <uri
+                name="https://jakarta.ee/xml/ns/jakartaee/web-facelettaglibrary_3_0.xsd"
+                uri="https://jakarta.ee/xml/ns/jakartaee/web-facelettaglibrary_3_0.xsd"/>
                 
             <public
                 publicId="-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
@@ -420,11 +479,17 @@
                 name="http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_0.xsd"
                 uri="dtdsAndSchemas/web-facesconfig_2_0.xsd"/>
             <uri
+                name="http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_1.xsd"
+                uri="http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_1.xsd"/>
+            <uri
                 name="http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd"
                 uri="dtdsAndSchemas/web-facesconfig_2_2.xsd"/>
             <uri
                 name="http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_3.xsd"
                 uri="dtdsAndSchemas/web-facesconfig_2_3.xsd"/>
+            <uri
+                name="https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd"
+                uri="https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd"/>
 
 
             <uri
@@ -447,6 +512,9 @@
             <uri
                 name="http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"
                 uri="dtdsAndSchemas/web-fragment_4_0.xsd" />
+            <uri
+                name="https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"
+                uri="platform:/plugin/jakarta.servlet/jakarta/servlet/resources/web-fragment_5_0.xsd" />
 
 
             <public
@@ -469,6 +537,9 @@
             <uri
                 name="http://xmlns.jcp.org/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
                 uri="dtdsAndSchemas/web-jsptaglibrary_2_1.xsd" />
+            <uri
+                name="https://jakarta.ee/xml/ns/jakartaee/web-jsptaglibrary_3_0.xsd"
+                uri="platform:/plugin/jakarta.servlet/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd" />
 
 
             <uri
diff --git a/web/bundles/org.eclipse.jst.standard.schemas/pom.xml b/web/bundles/org.eclipse.jst.standard.schemas/pom.xml
index 0dbdd64..114f2e0 100644
--- a/web/bundles/org.eclipse.jst.standard.schemas/pom.xml
+++ b/web/bundles/org.eclipse.jst.standard.schemas/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.jst.standard.schemas</artifactId>
-  <version>1.2.300-SNAPSHOT</version>
+  <version>1.2.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>