26 files changed, 133 insertions, 16 deletions
diff --git a/ivysettings.xml b/ivysettings.xml
index 3542a3e549..6cb125ddd3 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -59,6 +59,8 @@
             resolver="vaadin-maven" />
         <module organisation="com.vaadin" name="vaadin-liferay"
             resolver="vaadin-maven" />
+        <module organisation="com.vaadin" name="vaadin-uitest-common"
+            resolver="vaadin-maven" />
     </modules>
 
 
diff --git a/pom.xml b/pom.xml
index 51356c7f7a..30df8949a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,6 +100,7 @@
 		<module>client-compiled</module>
 		<module>themes</module>
 		<module>widgets</module>
+		<module>uitest-common</module>
 		<module>uitest</module>
 		<module>liferay</module>
 		<module>all</module>
diff --git a/uitest-common/pom.xml b/uitest-common/pom.xml
new file mode 100644
index 0000000000..d46927fd2a
--- /dev/null
+++ b/uitest-common/pom.xml
@@ -0,0 +1,114 @@
+<?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-root</artifactId>
+		<version>8.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>vaadin-uitest-common</artifactId>
+	<name>vaadin-uitest-common</name>
+	<packaging>jar</packaging>
+	<properties>
+		<skip.uitest.deployment>true</skip.uitest.deployment>
+	</properties>
+
+	<url>https://vaadin.com/</url>
+	<description>Vaadin UI test common classes and dependencies</description>
+
+	<repositories>
+		<repository>
+			<id>vaadin-addons</id>
+			<url>http://maven.vaadin.com/vaadin-addons</url>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<!-- LIBRARY DEPENDENCIES (compile time) -->
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-server</artifactId>
+			<version>${project.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.servlet</groupId>
+					<artifactId>javax.servlet-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.11</version>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>${commons-io.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-testbench</artifactId>
+			<version>4.0.3</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>${skip.uitest.deployment}</skip>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>animal-sniffer-maven-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.sonatype.plugins</groupId>
+					<artifactId>nexus-staging-maven-plugin</artifactId>
+					<configuration>
+						<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+					</configuration>
+				</plugin>
+				<plugin>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<configuration>
+						<skip>true</skip>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+
+	<profiles>
+		<profile>
+			<!-- Profile used to deploy the uitest-common jar for testing -->
+			<id>dev-build</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<properties>
+				<skip.uitest.deployment>false</skip.uitest.deployment>
+			</properties>
+		</profile>
+	</profiles>
+
+</project>
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/AbstractTB3Test.java
index 7029abd9ac..9c617ab128 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -72,7 +72,6 @@ import com.vaadin.testbench.elements.VerticalLayoutElement;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.testbench.parallel.ParallelTest;
-import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.ui.UI;
 
 import elemental.json.JsonObject;
@@ -507,7 +506,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
     }
 
     /**
-     * For tests extending {@link AbstractTestUIWithLog}, returns the element
+     * For tests extending AbstractTestUIWithLog, returns the element
      * for the Nth log row
      * 
      * @param rowNr
@@ -519,7 +518,7 @@ public abstract class AbstractTB3Test extends ParallelTest {
     }
 
     /**
-     * For tests extending {@link AbstractTestUIWithLog}, returns the text in
+     * For tests extending AbstractTestUIWithLog, returns the text in
      * the Nth log row
      * 
      * @param rowNr
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/BrowserStackBrowserFactory.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/BrowserStackBrowserFactory.java
index ab9f7018eb..ab9f7018eb 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/BrowserStackBrowserFactory.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/BrowserStackBrowserFactory.java
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java
index 00d7788f8b..00d7788f8b 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/ExcludeFromSuite.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/ExcludeFromSuite.java
index dd061646be..dd061646be 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/ExcludeFromSuite.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/ExcludeFromSuite.java
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/IncludeIfProperty.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/IncludeIfProperty.java
index 789422c0c6..789422c0c6 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/IncludeIfProperty.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/IncludeIfProperty.java
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTest.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/MultiBrowserTest.java
index ec40510d96..ec40510d96 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTest.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/MultiBrowserTest.java
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/ParallelScheduler.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/ParallelScheduler.java
index ef9ee382d0..ef9ee382d0 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/ParallelScheduler.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/ParallelScheduler.java
diff --git a/uitest/src/test/java/com/vaadin/tests/integration/ParameterizedTB3Runner.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/ParameterizedTB3Runner.java
index b051fb51db..06e1ea9df9 100644
--- a/uitest/src/test/java/com/vaadin/tests/integration/ParameterizedTB3Runner.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/ParameterizedTB3Runner.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.integration;
+package com.vaadin.tests.tb3;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -27,8 +27,6 @@ import org.junit.runners.Parameterized.Parameters;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.InitializationError;
 
-import com.vaadin.tests.tb3.TB3Runner;
-
 /**
  * TestBench test runner which supports static @Parameters annotated methods
  * providing parameters for the corresponding setter.
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java
index 85104c784b..85104c784b 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/RetryOnFail.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/RetryOnFail.java
index 7a1656a0d2..7a1656a0d2 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/RetryOnFail.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/RetryOnFail.java
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/SauceLabsBrowserFactory.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/SauceLabsBrowserFactory.java
index 8eae64d0b8..8eae64d0b8 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/SauceLabsBrowserFactory.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/SauceLabsBrowserFactory.java
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java
index d94e05efdb..d94e05efdb 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTest.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/SingleBrowserTest.java
index b5389d3eec..b5389d3eec 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTest.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/SingleBrowserTest.java
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java
index 7447a3c056..7447a3c056 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/TB3Runner.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3Runner.java
index 4917e398cf..4917e398cf 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/TB3Runner.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3Runner.java
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/TB3TestLocator.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestLocator.java
index eb0861757e..eb0861757e 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/TB3TestLocator.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestLocator.java
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/TB3TestSuite.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestSuite.java
index c68d59a4eb..c68d59a4eb 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/TB3TestSuite.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestSuite.java
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java b/uitest-common/src/main/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java
index 2389811ff0..2389811ff0 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java
+++ b/uitest-common/src/main/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java
diff --git a/uitest/ivy.xml b/uitest/ivy.xml
index be1f7acc34..c926e4105a 100644
--- a/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@ -30,6 +30,10 @@
 
         <!-- LIBRARY DEPENDENCIES (compile time) -->
         <!-- Project modules -->
+        <dependency org="com.vaadin" name="vaadin-uitest-common"
+            rev="${vaadin.version}" conf="build->default">
+            <exclude type="pom" />
+        </dependency>
         <dependency org="com.vaadin" name="vaadin-server"
             rev="${vaadin.version}" conf="build->default">
             <exclude org="javax.servlet"></exclude>
diff --git a/uitest/pom.xml b/uitest/pom.xml
index 56636b8b10..01c1fd2799 100644
--- a/uitest/pom.xml
+++ b/uitest/pom.xml
@@ -168,6 +168,14 @@
 			<version>3.1.0</version>
 			<scope>provided</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-uitest-common</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -201,12 +209,6 @@
 			<artifactId>hsqldb</artifactId>
 			<version>2.2.6</version>
 		</dependency>
-		<dependency>
-			<groupId>com.vaadin</groupId>
-			<artifactId>vaadin-testbench</artifactId>
-			<version>4.0.3</version>
-			<scope>test</scope>
-		</dependency>
 		<!-- This should be removed once tests have been updated to use lang3 -->
 		<dependency>
 			<groupId>commons-lang</groupId>
diff --git a/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java b/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java
index eb1b714776..efac8477ff 100644
--- a/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java
@@ -25,6 +25,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized.Parameters;
 
 import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.tests.tb3.ParameterizedTB3Runner;
 
 /**
  * Base class for servlet integration tests. Automatically prepends "/demo" to
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTest.java
index 9a02b29bc2..73446dfc03 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTest.java
@@ -25,8 +25,6 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized.Parameters;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
-import com.vaadin.tests.integration.ParameterizedTB3Runner;
-
 /**
  * Test which uses theme returned by {@link #getTheme()} for running the test
  */
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTestWithProxy.java b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTestWithProxy.java
index 26ed8288d1..a64a70022e 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTestWithProxy.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTestWithProxy.java
@@ -25,8 +25,6 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized.Parameters;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
-import com.vaadin.tests.integration.ParameterizedTB3Runner;
-
 @RunWith(ParameterizedTB3Runner.class)
 public abstract class MultiBrowserThemeTestWithProxy extends
         MultiBrowserTestWithProxy {