From ab9c6e36eeec22c27f91da8968476af9b0897ffc Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Mon, 15 Dec 2025 10:39:19 +0100
Subject: [PATCH] Remove legacy/jakarta Undertow as we only need one, and
 upgrade to the latest to fix CVEs (#44901)

Closes #44814

Signed-off-by: stianst <stianst@gmail.com>
---
 pom.xml                                  | 4 +---
 testsuite/integration-arquillian/pom.xml | 1 -
 testsuite/utils/pom.xml                  | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index b0507c07f09..e5fb2297ea5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,9 +118,7 @@
         <sun.xml.ws.version>4.0.0</sun.xml.ws.version>
         <sun.activation.version>1.2.2</sun.activation.version>
         <org.glassfish.jaxb.xsom.version>2.3.3-b02</org.glassfish.jaxb.xsom.version>
-        <undertow.version>${undertow-legacy.version}</undertow.version>
-        <undertow-legacy.version>2.2.24.Final</undertow-legacy.version>
-        <undertow-jakarta.version>2.3.2.Final</undertow-jakarta.version>
+        <undertow.version>2.3.20.Final</undertow.version>
         <wildfly-elytron.version>2.6.5.Final</wildfly-elytron.version>
         <elytron.undertow-server.version>1.9.0.Final</elytron.undertow-server.version>
         <woodstox.version>6.0.3</woodstox.version>
diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml
index 57cf27f9fb3..3a3cd66e6df 100644
--- a/testsuite/integration-arquillian/pom.xml
+++ b/testsuite/integration-arquillian/pom.xml
@@ -52,7 +52,6 @@
         <arquillian-wildfly-container.version>3.0.1.Final</arquillian-wildfly-container.version>
         <arquillian-wls-container.version>1.0.1.Final</arquillian-wls-container.version>
         <arquillian-infinispan-container.version>1.2.0.Beta3</arquillian-infinispan-container.version>
-        <undertow.version>${undertow-jakarta.version}</undertow.version>
         <undertow-embedded.version>1.0.0.Final</undertow-embedded.version>
         <version.org.wildfly.extras.creaper>2.0.3</version.org.wildfly.extras.creaper>
         <jakarta.persistence-legacy.version>2.2.3</jakarta.persistence-legacy.version>
diff --git a/testsuite/utils/pom.xml b/testsuite/utils/pom.xml
index 419f9aa2153..ba7df30e74f 100755
--- a/testsuite/utils/pom.xml
+++ b/testsuite/utils/pom.xml
@@ -162,7 +162,6 @@
         <dependency>
             <groupId>io.undertow</groupId>
             <artifactId>undertow-servlet</artifactId>
-            <version>${undertow-jakarta.version}</version>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>