Move microprofile tests to profile, add Wildfly Swarm (#10156)

diff --git a/test/servlet-containers/payara-micro/pom.xml b/test/servlet-containers/payara-micro/pom.xml
new file mode 100644 (file)
index 0000000..e4e6f34
--- /dev/null
+++ b/test/servlet-containers/payara-micro/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-servlet-containers-test</artifactId>
+        <version>8.2-SNAPSHOT</version>
+    </parent>
+    <artifactId>vaadin-test-payara-micro-server</artifactId>
+    <name>Vaadin Payara Micro Test</name>
+    <packaging>war</packaging>
+    <properties>
+        <jetty.skip>true</jetty.skip>
+        <payara.version>4.1.2.173</payara.version>
+        <server.name>payara-micro</server.name>
+    </properties>
+
+    <dependencies>
+        <!-- UI classes and tests from dependencies -->
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-test-server-ui</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-test-server-tests</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- Server configuration -->
+            <plugin>
+                <groupId>fish.payara.maven.plugins</groupId>
+                <artifactId>payara-micro-maven-plugin</artifactId>
+            </plugin>
+
+            <!-- Payara Micro starting time is a bit over a minute. Need to wait. -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version>
+                <executions>
+                    <execution>
+                        <id>wait-for-server-start</id>
+                        <phase>pre-integration-test</phase>
+                        <configuration>
+                            <target>
+                                <echo message="Waiting for Payara Micro server to start" />
+                                <!-- Starting time from a couple of local test runs -->
+                                <sleep seconds="65" />
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

diff --git a/test/servlet-containers/payara/pom.xml b/test/servlet-containers/payara/pom.xml
deleted file mode 100644 (file)
index 506fb63..0000000
--- a/test/servlet-containers/payara/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.vaadin</groupId>
-        <artifactId>vaadin-servlet-containers-test</artifactId>
-        <version>8.2-SNAPSHOT</version>
-    </parent>
-    <artifactId>vaadin-test-payara-server</artifactId>
-    <name>Vaadin Payara Test</name>
-    <packaging>war</packaging>
-    <properties>
-        <jetty.skip>true</jetty.skip>
-        <payara.version>4.1.2.173</payara.version>
-        <server.name>payara</server.name>
-    </properties>
-
-    <dependencies>
-        <!-- UI classes and tests from dependencies -->
-        <dependency>
-            <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-test-server-ui</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-test-server-tests</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <!-- Server configuration -->
-            <plugin>
-                <groupId>fish.payara.maven.plugins</groupId>
-                <artifactId>payara-micro-maven-plugin</artifactId>
-            </plugin>
-
-            <!-- Payara Micro starting time is a bit over a minute. Need to wait. -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.8</version>
-                <executions>
-                    <execution>
-                        <id>wait-for-server-start</id>
-                        <phase>pre-integration-test</phase>
-                        <configuration>
-                            <target>
-                                <echo message="Waiting for Payara Micro server to start" />
-                                <!-- Starting time from a couple of local test runs -->
-                                <sleep seconds="65" />
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

diff --git a/test/servlet-containers/pom.xml b/test/servlet-containers/pom.xml
index 40f69bfa8f598b6c70231d1f9a32c33526425339..c5ced080bd2b351393c40473da7b31516e38abe8 100644 (file)
--- a/test/servlet-containers/pom.xml
+++ b/test/servlet-containers/pom.xml
@@ -240,9 +240,10 @@
                 <module>wildfly10</module>
                 <module>wildfly9</module>
                 <module>wildfly8</module>
+                <module>wildfly-swarm</module>
                 <module>jetty8</module>
                 <module>jetty9</module>
-                <module>payara</module>
+                <module>payara-micro</module>
                 <module>glassfish</module>
                 <!-- TODO: Payara 5 and Glassfish 5 -->
                 <module>tomcat7</module>
@@ -281,14 +282,12 @@
             <modules>
                 <module>liberty-webprofile</module>
                 <module>liberty-javaee</module>
-                <module>liberty-microprofile</module>
             </modules>
         </profile>
         <profile>
             <id>glassfish</id>
             <modules>
                 <module>glassfish</module>
-                <module>payara</module>
             </modules>
         </profile>
         <profile>
@@ -300,6 +299,14 @@
                 <module>tomcat9</module>
             </modules>
         </profile>
+        <profile>
+            <id>microprofile</id>
+            <modules>
+                <module>wildfly-swarm</module>
+                <module>payara-micro</module>
+                <module>liberty-microprofile</module>
+            </modules>
+        </profile>
     </profiles>
 
 </project>

diff --git a/test/servlet-containers/wildfly-swarm/pom.xml b/test/servlet-containers/wildfly-swarm/pom.xml
new file mode 100644 (file)
index 0000000..56d7a02
--- /dev/null
+++ b/test/servlet-containers/wildfly-swarm/pom.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-servlet-containers-test</artifactId>
+        <version>8.2-SNAPSHOT</version>
+    </parent>
+    <artifactId>vaadin-test-wildfly-swarm-server</artifactId>
+    <name>Vaadin Wildfly Swarm Test</name>
+    <packaging>war</packaging>
+    <properties>
+        <jetty.skip>true</jetty.skip>
+        <wildfly.swarm.version>2017.9.5</wildfly.swarm.version>
+        <context.path>/</context.path>
+        <server.name>wildfly-swarm</server.name>
+    </properties>
+
+    <dependencies>
+        <!-- UI classes and tests from dependencies -->
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-test-server-ui</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-test-server-tests</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- Server configuration -->
+            <plugin>
+                <groupId>org.wildfly.swarm</groupId>
+                <artifactId>wildfly-swarm-plugin</artifactId>
+                <version>${wildfly.swarm.version}</version>
+                <executions>
+                    <execution>
+                        <id>start-swarm</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>package</goal>
+                            <goal>start</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>stop-swarm</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <useUberJar>true</useUberJar>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>