diff options
| author | Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com> | 2017-10-10 12:59:28 +0300 |
|---|---|---|
| committer | Henri Sara <henri.sara@gmail.com> | 2017-10-10 12:59:28 +0300 |
| commit | a8f23e84a0fbb5da515cacffb8f5a85fd4c21694 (patch) | |
| tree | bf33f0ee246ce7df9194ce14fd68af0299312538 | |
| parent | 4ac4b62434ab48fdb7d3ca9c479383d4242062aa (diff) | |
| download | vaadin-framework-a8f23e84a0fbb5da515cacffb8f5a85fd4c21694.tar.gz vaadin-framework-a8f23e84a0fbb5da515cacffb8f5a85fd4c21694.zip | |
Move microprofile tests to profile, add Wildfly Swarm (#10156)
| -rw-r--r-- | test/servlet-containers/payara-micro/pom.xml (renamed from test/servlet-containers/payara/pom.xml) | 6 | ||||
| -rw-r--r-- | test/servlet-containers/pom.xml | 13 | ||||
| -rw-r--r-- | test/servlet-containers/wildfly-swarm/pom.xml | 65 |
3 files changed, 78 insertions, 6 deletions
diff --git a/test/servlet-containers/payara/pom.xml b/test/servlet-containers/payara-micro/pom.xml index 506fb635f9..e4e6f3416e 100644 --- a/test/servlet-containers/payara/pom.xml +++ b/test/servlet-containers/payara-micro/pom.xml @@ -7,13 +7,13 @@ <artifactId>vaadin-servlet-containers-test</artifactId> <version>8.2-SNAPSHOT</version> </parent> - <artifactId>vaadin-test-payara-server</artifactId> - <name>Vaadin Payara Test</name> + <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</server.name> + <server.name>payara-micro</server.name> </properties> <dependencies> diff --git a/test/servlet-containers/pom.xml b/test/servlet-containers/pom.xml index 40f69bfa8f..c5ced080bd 100644 --- 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 index 0000000000..56d7a02f86 --- /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> |