From 59211beda0aaee3469336a671de5a7ccfb62f014 Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com>
Date: Thu, 2 Feb 2017 12:48:02 +0200
Subject: Handle system properties for failsafe plugin (#8414)

* Handle system properties for failsafe plugin
---
 uitest/pom.xml | 42 +++++++++++-------------------------------
 1 file changed, 11 insertions(+), 31 deletions(-)

(limited to 'uitest/pom.xml')

diff --git a/uitest/pom.xml b/uitest/pom.xml
index 3ebff16bf2..e88e46d2ac 100644
--- a/uitest/pom.xml
+++ b/uitest/pom.xml
@@ -331,8 +331,17 @@
                         <include>**/AllTB3Tests.java</include>
                     </includes>
                     <systemPropertyVariables>
+                        <!-- Static path for screenshots pointing to submodule -->
                         <com.vaadin.testbench.screenshot.directory>${project.parent.basedir}/tests/screenshots</com.vaadin.testbench.screenshot.directory>
-                        <com.vaadin.testbench.max.retries>2</com.vaadin.testbench.max.retries>
+
+                        <!-- Optional properties for the test build -->
+                        <vaadin.testbench.developer.license>${vaadin.testbench.developer.license}</vaadin.testbench.developer.license>
+                        <com.vaadin.testbench.max.retries>${com.vaadin.testbench.max.retries}</com.vaadin.testbench.max.retries>
+                        <browsers.include>${browsers.include}</browsers.include>
+                        <browsers.exclude>${browsers.exclude}</browsers.exclude>
+                        <categories.include>${categories.include}</categories.include>
+                        <categories.exclude>${categories.exclude}</categories.exclude>
+                        <useLocalWebDriver>${useLocalWebDriver}</useLocalWebDriver>
                     </systemPropertyVariables>
                 </configuration>
                 <executions>
@@ -444,36 +453,7 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>validation</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <artifactId>maven-failsafe-plugin</artifactId>
-                            <configuration>
-                                <systemPropertyVariables>
-                                    <useLocalWebDriver>true</useLocalWebDriver>
-                                    <browsers.include>phantomjs1</browsers.include>
-                                    <categories.exclude>push,needs-ssh</categories.exclude>
-                                </systemPropertyVariables>
-                            </configuration>
-                            <executions>
-                                <execution>
-                                    <goals>
-                                        <goal>integration-test</goal>
-                                        <goal>verify</goal>
-                                    </goals>
-                                </execution>
-                            </executions>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
+
     </profiles>
 
 </project>
-- 
cgit v1.2.3