From 475d2093cf2f5c359bcecb4c2971dec8b6ad56fa Mon Sep 17 00:00:00 2001
From: Brian Stansberry <brian.stansberry@redhat.com>
Date: Sun, 1 May 2022 10:13:03 -0500
Subject: [PATCH 1/2] [WFLY-16338] Upgrade JBoss Metadata to 15.1.0.Alpha1

Pick up draft versions of the EE 10 xsds
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d10883523c81..8c37dfeec453 100644
--- a/pom.xml
+++ b/pom.xml
@@ -453,7 +453,7 @@
         <version.org.jboss.jboss-transaction-spi>7.6.1.Final</version.org.jboss.jboss-transaction-spi>
         <!-- Only used for testing -->
         <version.org.jboss.logmanager.commons-logging-jboss-logmanager>1.0.3.Final</version.org.jboss.logmanager.commons-logging-jboss-logmanager>
-        <version.org.jboss.metadata>14.0.0.Final</version.org.jboss.metadata>
+        <version.org.jboss.metadata>15.1.0.Alpha1</version.org.jboss.metadata>
         <version.org.jboss.mod_cluster>2.0.1.Final</version.org.jboss.mod_cluster>
         <version.org.jboss.narayana>5.12.5.Final</version.org.jboss.narayana>
         <version.org.jboss.openjdk-orb>8.1.9.Final</version.org.jboss.openjdk-orb>

From 9982d5afc29a0e595493472980ee615cad3d4ae0 Mon Sep 17 00:00:00 2001
From: Brian Stansberry <brian.stansberry@redhat.com>
Date: Mon, 2 May 2022 23:18:50 -0500
Subject: [PATCH 2/2] [WFLY-16342] Add Jakarta EE 10 web-app_6_0.xsd handling
 to WebParsingDeploymentProcessor

---
 .../undertow/deployment/WebParsingDeploymentProcessor.java      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/undertow/src/main/java/org/wildfly/extension/undertow/deployment/WebParsingDeploymentProcessor.java b/undertow/src/main/java/org/wildfly/extension/undertow/deployment/WebParsingDeploymentProcessor.java
index 90b16920ad23..586e62c8bb01 100644
--- a/undertow/src/main/java/org/wildfly/extension/undertow/deployment/WebParsingDeploymentProcessor.java
+++ b/undertow/src/main/java/org/wildfly/extension/undertow/deployment/WebParsingDeploymentProcessor.java
@@ -115,6 +115,8 @@ else if (webMetaData.getVersion() != null && webMetaData.getVersion().equals("4.
                                 validator.validate("http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd", xmlInput);
                             else if (webMetaData.getVersion() != null && webMetaData.getVersion().equals("5.0"))
                                 validator.validate("https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd", xmlInput);
+                            else if (webMetaData.getVersion() != null && webMetaData.getVersion().equals("6.0"))
+                                validator.validate("https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd", xmlInput);
                             else
                                 validator.validate("-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN", xmlInput);
                         } catch (SAXException e) {