From c0b82ae72bb754bed379027273d1f6811675696e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Barto=C5=A1?= <mabartos@redhat.com>
Date: Tue, 17 Jan 2023 13:01:43 +0100
Subject: [PATCH] Upgrade Arquillian Undertow embedded

---
 testsuite/integration-arquillian/pom.xml                 | 3 +--
 .../servers/adapter-spi/undertow-adapter-jakarta/pom.xml | 6 +++---
 .../adapter-spi/undertow-adapter-saml-jakarta/pom.xml    | 9 +++++++--
 .../adapter-spi/undertow-adapter-spi-jakarta/pom.xml     | 6 +++---
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml
index b768af23b4..5209f7dfa5 100644
--- a/testsuite/integration-arquillian/pom.xml
+++ b/testsuite/integration-arquillian/pom.xml
@@ -54,8 +54,7 @@
         <arquillian-tomcat8-container-version>1.1.0.Final</arquillian-tomcat8-container-version>
         <arquillian-tomcat9-container-version>1.1.0.Final</arquillian-tomcat9-container-version>
         <undertow.version>${undertow-jakarta.version}</undertow.version>
-        <undertow-embedded.version>1.0.0.Alpha2</undertow-embedded.version>
-<!--        <undertow-embedded.version>1.0.0.Final-SNAPSHOT</undertow-embedded.version>-->
+        <undertow-embedded.version>1.0.0.Final</undertow-embedded.version>
         <version.org.wildfly.extras.creaper>1.6.1</version.org.wildfly.extras.creaper>
         <appium.client.version>6.1.0</appium.client.version>
 
diff --git a/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta/pom.xml b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta/pom.xml
index 02953eb3fd..f95bf96126 100644
--- a/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta/pom.xml
+++ b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>integration-arquillian-servers</artifactId>
+        <artifactId>integration-arquillian-servers-adapter-spi</artifactId>
         <groupId>org.keycloak.testsuite</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,7 +33,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.keycloak</groupId>
+            <groupId>org.keycloak.testsuite</groupId>
             <artifactId>keycloak-undertow-adapter-spi-jakarta</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-saml-jakarta/pom.xml b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-saml-jakarta/pom.xml
index 6399ec7a1f..60fa64d175 100644
--- a/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-saml-jakarta/pom.xml
+++ b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-saml-jakarta/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>integration-arquillian-servers</artifactId>
+        <artifactId>integration-arquillian-servers-adapter-spi</artifactId>
         <groupId>org.keycloak.testsuite</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -48,6 +48,11 @@
             <artifactId>keycloak-saml-adapter-core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.keycloak.testsuite</groupId>
+            <artifactId>keycloak-undertow-adapter-spi-jakarta</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.keycloak.testsuite</groupId>
             <artifactId>keycloak-undertow-adapter-jakarta</artifactId>
diff --git a/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-spi-jakarta/pom.xml b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-spi-jakarta/pom.xml
index a33f4aad3a..592a5a8c43 100644
--- a/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-spi-jakarta/pom.xml
+++ b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-spi-jakarta/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>keycloak-adapters-pom</artifactId>
-        <groupId>org.keycloak</groupId>
+        <artifactId>integration-arquillian-servers-adapter-spi</artifactId>
+        <groupId>org.keycloak.testsuite</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../../../../adapters/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>