Use Chrome for validation builds

pom.xml

@@ -47,7 +47,8 @@
         <!-- Dependency unpack directory -->
         <dependency.unpack.directory>${project.build.directory}/dependency-unpack</dependency.unpack.directory>
 
-        <jetty.version>9.3.7.v20160115</jetty.version>
+        <!-- Cannot use 9.3 or 9.4 because they sometimes reset the connection too early in case of errors -->
+        <jetty.version>9.2.9.v20150224</jetty.version>
         <phantomjs.version>2.1.1</phantomjs.version>
     </properties>
 

uitest/pom.xml

@@ -13,6 +13,10 @@
     <properties>
         <skip.uitest.deployment>true</skip.uitest.deployment>
         <skip.uitest.failsafe>true</skip.uitest.failsafe>
+
+        <!-- Parallel test count -->
+        <parallel.tests>12</parallel.tests>
+        <reference.screenshot.dir>${project.parent.basedir}/tests/screenshots/reference</reference.screenshot.dir>
     </properties>
 
     <url>https://vaadin.com/</url>
@@ -23,6 +27,16 @@
             <id>vaadin-addons</id>
             <url>http://maven.vaadin.com/vaadin-addons</url>
         </repository>
+        <repository>
+            <id>vaadin-snapshots</id>
+            <url>http://oss.sonatype.org/content/repositories/vaadin-snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -200,7 +214,7 @@
         <dependency>
             <groupId>com.vaadin</groupId>
             <artifactId>vaadin-testbench</artifactId>
-            <version>4.0.3</version>
+            <version>4.3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <!-- This should be removed once tests have been updated to use lang3 -->
@@ -307,13 +321,16 @@
                         <include>**/AllTB3Tests.java</include>
                     </includes>
                     <systemPropertyVariables>
-                        <com.vaadin.testbench.screenshot.directory>${project.parent.basedir}/tests/screenshots</com.vaadin.testbench.screenshot.directory>
-                        <com.vaadin.testbench.max.retries>${com.vaadin.testbench.max.retries}</com.vaadin.testbench.max.retries>
-                        <useLocalWebDriver>${useLocalWebDriver}</useLocalWebDriver>
+                        <com.vaadin.testbench.Parameters.screenshotReferenceDirectory>${reference.screenshot.dir}</com.vaadin.testbench.Parameters.screenshotReferenceDirectory>
+                        <com.vaadin.testbench.Parameters.screenshotErrorDirectory>${project.build.directory}/error-screenshots</com.vaadin.testbench.Parameters.screenshotErrorDirectory>
+                        <com.vaadin.testbench.Parameters.maxAttempts>${com.vaadin.testbench.Parameters.maxAttempts}</com.vaadin.testbench.Parameters.maxAttempts>
+                        <com.vaadin.testbench.Parameters.testsInParallel>${parallel.tests}</com.vaadin.testbench.Parameters.testsInParallel>
+                        <com.vaadin.testbench.hub.url>${com.vaadin.testbench.hub.url}</com.vaadin.testbench.hub.url>
                         <browsers.include>${browsers.include}</browsers.include>
                         <categories.include>${categoriess.include}</categories.include>
                         <browsers.exclude>${browsers.exclude}</browsers.exclude>
                         <categories.exclude>${categories.exclude}</categories.exclude>
+                        <browser.factory>${browser.factory}</browser.factory>
                     </systemPropertyVariables>
                 </configuration>
                 <executions>
@@ -434,36 +451,6 @@
             </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>