Use WildFly as the default app server

.github/actions/build-keycloak/action.yml

@@ -49,7 +49,7 @@ runs:
       # By using "dependency:resolve", it will download all dependencies used in later stages for running the tests
       run: |
         MVN_HTTP_CONFIG="-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120"
-        ./mvnw install dependency:resolve -nsu -B -e -DskipTests -DskipExamples $MVN_HTTP_CONFIG -Papp-server-wildfly
+        ./mvnw install dependency:resolve -nsu -B -e -DskipTests -DskipExamples $MVN_HTTP_CONFIG
 
     - id: compress-keycloak-maven-repository
       name: Compress Keycloak Maven artifacts

testsuite/integration-arquillian/HOW-TO-RUN.md

@@ -141,6 +141,7 @@ and add packages manually.
 ### Undertow
     mvn -f testsuite/integration-arquillian/tests/base/pom.xml \
         -Dtest=org.keycloak.testsuite.adapter.**.*Test
+        -Papp-server-undertow
 
 ### Jetty
 

testsuite/integration-arquillian/pom.xml

@@ -37,7 +37,7 @@
         <containers.home>${project.build.directory}/containers</containers.home>
         <auth.server.java.home>${java.home}</auth.server.java.home>
         <app.server.java.home>${java.home}</app.server.java.home>
-        <app.server>undertow</app.server>
+        <app.server>wildfly</app.server>
         <cache.server.java.home>${java.home}</cache.server.java.home>
 
         <!--component versions-->

testsuite/integration-arquillian/servers/app-server/jboss/pom.xml

@@ -794,6 +794,7 @@
         <profile>
             <id>app-server-wildfly</id>
             <activation>
+                <activeByDefault>true</activeByDefault>
                 <property>
                     <name>app.server</name>
                     <value>wildfly</value>

testsuite/integration-arquillian/tests/base/pom.xml

@@ -141,9 +141,8 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak.testsuite</groupId>
-            <artifactId>integration-arquillian-servers-app-server-undertow</artifactId>
+            <artifactId>integration-arquillian-util</artifactId>
             <version>${project.version}</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.keycloak.testsuite</groupId>
@@ -501,9 +500,30 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>app-server-undertow</id>
+            <activation>
+                <property>
+                    <name>app.server</name>
+                    <value>undertow</value>
+                </property>
+            </activation>
+            <properties>
+                <app.server>undertow</app.server> <!--in case the profile is called directly-->
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.keycloak.testsuite</groupId>
+                    <artifactId>integration-arquillian-servers-app-server-undertow</artifactId>
+                    <version>${project.version}</version>
+                    <scope>runtime</scope>
+                </dependency>
+            </dependencies>
+        </profile>
         <profile>
             <id>app-server-wildfly</id>
             <activation>
+                <activeByDefault>true</activeByDefault>
                 <property>
                     <name>app.server</name>
                     <value>wildfly</value>

testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java

@@ -71,7 +71,7 @@ public class AppServerTestEnricher {
 
     private static final Logger log = Logger.getLogger(AppServerTestEnricher.class);
 
-    public static final String CURRENT_APP_SERVER = System.getProperty("app.server", "undertow");
+    public static final String CURRENT_APP_SERVER = System.getProperty("app.server", "wildfly");
     public static final boolean APP_SERVER_SSL_REQUIRED = Boolean.parseBoolean(System.getProperty("app.server.ssl.required", "false"));
 
     @Inject private Instance<ContainerController> containerConrollerInstance;

testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/RegistryCreator.java

@@ -110,7 +110,7 @@ public class RegistryCreator {
     private void addAppServerContainers(List<ContainerDef> containerDefs, List<GroupDef> groupDefs) {
         Node parent = ((NodeDescriptor)containerDefs.get(0)).getRootNode();
 
-        String appServerName = System.getProperty("app.server", "undertow");
+        String appServerName = System.getProperty("app.server", "wildfly");
 
         List<Node> containers = AppServerContainerService.getInstance().getContainers(appServerName);
         if (containers == null) {

testsuite/integration-arquillian/tests/other/pom.xml

@@ -36,6 +36,10 @@
     <description>Test modules that depend on the Base TestSuite.
         This POM contains common configuration for submodules.</description>
 
+    <properties>
+        <app.server>undertow</app.server>
+    </properties>
+
     <build>
         <pluginManagement>
             <plugins>