Update WildFly test configs and add managed profile

see: #306
eclipse-ee4j · Jul 29, 2022 · f91d187 · f91d187
1 parent 08059d1
commit f91d187
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -10,9 +10,9 @@ and currently contains support for RESTEasy and Jersey with a well-defined SPI f
 Eclipse Krazo has configurations to run the testsuite against a bunch of application servers like WildFly, Payara, Glassfish or Liberty.
 The following sections describe how you test Eclipse Krazo against them. At the moment, we test against following servers:
 
-- Glassfish 6.2.2
-- WildFly 25.x.x
-- OpenLiberty 21.* Beta
+- Glassfish 7.x.x
+- WildFly 27.x.x
+- OpenLiberty 22.* Beta
 
 ### Preconditions
 - JDK 11

diff --git a/pom.xml b/pom.xml
@@ -45,10 +45,10 @@
 
         <!-- DEPENDENCY PROPERTIES -->
         <spec.version>2.1.0.RC1</spec.version>
-        <tck.version>2.1.0.RC2</tck.version>
+        <tck.version>2.1.0-SNAPSHOT</tck.version>
 
         <jersey.version>3.1.0-M3</jersey.version>
-        <arquillian-bom.version>1.6.0.Final</arquillian-bom.version>
+        <arquillian-bom.version>1.7.0.Alpha10</arquillian-bom.version>
         <shrinkwrap-resolver-bom.version>3.1.4</shrinkwrap-resolver-bom.version>
         <jakartaee-api.version>10.0.0-RC1</jakartaee-api.version>
         <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
@@ -63,9 +63,9 @@
         <hibernate-validator-cdi.version>8.0.0.CR1</hibernate-validator-cdi.version>
         <resteasy.version>6.1.0.Beta2</resteasy.version>
         <gf.jakarta.el.version>5.0.0-M1</gf.jakarta.el.version>
-        <htmlunit.version>2.55.0</htmlunit.version>
+        <htmlunit.version>2.63.0</htmlunit.version>
         <arquillian-glassfish-remote-3.1.version>1.0.0.Final</arquillian-glassfish-remote-3.1.version>
-        <wildfly-arquillian-container-remote.version>2.1.1.Final</wildfly-arquillian-container-remote.version>
+        <wildfly-arquillian-container.version>5.0.0.Alpha3</wildfly-arquillian-container.version>
         <arquillian-liberty-managed-jakarta.version>2.0.0-M1</arquillian-liberty-managed-jakarta.version>
 
         <!-- PLUGIN PROPERTIES -->
@@ -87,6 +87,7 @@
         <asciidoctor-maven-plugin.version>2.0.0-RC.1</asciidoctor-maven-plugin.version>
         <maven-failsafe-plugin.version>2.18.1</maven-failsafe-plugin.version>
         <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
+        <maven-dependency-plugin.version>3.3.0</maven-dependency-plugin.version>
         <license-tool-plugin.version>0.0.1-SNAPSHOT</license-tool-plugin.version>
     </properties>
 
@@ -490,7 +491,14 @@
             <dependency>
                 <groupId>org.wildfly.arquillian</groupId>
                 <artifactId>wildfly-arquillian-container-remote</artifactId>
-                <version>${wildfly-arquillian-container-remote.version}</version>
+                <version>${wildfly-arquillian-container.version}</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.wildfly.arquillian</groupId>
+                <artifactId>wildfly-arquillian-container-managed</artifactId>
+                <version>${wildfly-arquillian-container.version}</version>
                 <scope>test</scope>
             </dependency>
 

diff --git a/testsuite/pom.xml b/testsuite/pom.xml
@@ -233,8 +233,6 @@
                 <dependency>
                     <groupId>org.wildfly.arquillian</groupId>
                     <artifactId>wildfly-arquillian-container-remote</artifactId>
-                    <version>2.1.1.Final</version>
-                    <scope>test</scope>
                 </dependency>
             </dependencies>
 
@@ -259,6 +257,81 @@
                 </plugins>
             </build>
         </profile>
+
+        <profile>
+            <id>testsuite-wildfly-managed</id>
+
+            <properties>
+                <skipITs>false</skipITs>
+
+                <wildfly.version>27.0.0.Alpha3</wildfly.version>
+            </properties>
+
+            <dependencies>
+                <dependency>
+                    <groupId>org.eclipse.krazo</groupId>
+                    <artifactId>krazo-resteasy</artifactId>
+                    <version>${project.version}</version>
+                    <scope>runtime</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.wildfly.arquillian</groupId>
+                    <artifactId>wildfly-arquillian-container-managed</artifactId>
+                </dependency>
+            </dependencies>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <version>${maven-dependency-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <id>unpack</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>org.wildfly</groupId>
+                                            <artifactId>wildfly-preview-dist</artifactId>
+                                            <version>${wildfly.version}</version>
+                                            <type>zip</type>
+                                            <overWrite>false</overWrite>
+                                            <outputDirectory>${project.build.directory}</outputDirectory>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <environmentVariables>
+                                <JBOSS_HOME>${project.build.directory}/wildfly-preview-${wildfly.version}</JBOSS_HOME>
+                            </environmentVariables>
+                            <systemProperties>
+                                <arquillian.launch>wildfly-managed</arquillian.launch>
+                                <testsuite.profile>testsuite-wildfly-managed</testsuite.profile>
+                            </systemProperties>
+                            <excludedGroups>
+                                org.eclipse.krazo.test.helper.annotation.IgnoreOnWildfly
+                            </excludedGroups>
+                            <argLine>
+                                --add-opens=java.base/java.security=ALL-UNNAMED
+                                --add-opens=java.base/java.io=ALL-UNNAMED
+                            </argLine>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
         <profile>
             <id>testsuite-glassfish</id>
             <properties>

diff --git a/testsuite/src/test/resources/arquillian.xml b/testsuite/src/test/resources/arquillian.xml
@@ -29,20 +29,28 @@
         <property name="browser">htmlunit</property>
     </extension>
 
-    <container qualifier="glassfish">
+    <container qualifier="glassfish" default="true">
         <configuration>
             <property name="adminHost">localhost</property>
             <property name="adminPort">4848</property>
         </configuration>
     </container>
 
-    <container qualifier="wildfly" default="true">
+    <container qualifier="wildfly">
         <configuration>
             <property name="username">admin</property>
             <property name="password">wildfly</property>
         </configuration>
     </container>
 
+    <container qualifier="wildfly-managed">
+        <configuration>
+            <property name="serverConfig">standalone-full.xml</property>
+            <property name="username">admin</property>
+            <property name="password">wildfly</property>
+        </configuration>
+    </container>
+
     <container qualifier="payara">
         <configuration>
             <property name="adminHttps">true</property>