Eliminate module uitest-common (#8583)

The use of the module in the test project was removed earlier, and
eliminating the module permits simpler and more reliable builds as
it was not deployed.

The classes that were in uitest-common are now in uitest.

pom.xml

@@ -585,7 +585,6 @@
                 <module>client-compiler</module>
                 <module>client-compiled</module>
                 <module>themes</module>
-                <module>uitest-common</module>
                 <module>uitest</module>
                 <module>liferay</module>
                 <module>all</module>

test/servlet-containers/generic/ivy.xml

@@ -27,10 +27,6 @@
 
         <!-- 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>

test/servlet-containers/generic/ivysettings.xml

@@ -69,8 +69,6 @@
             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>
 
 

test/servlet-containers/jsp-integration/pom.xml

@@ -19,12 +19,6 @@
             <artifactId>vaadin-client-compiled</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-uitest-common</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 </project>

uitest-common/pom.xml

@@ -1,113 +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-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>
-        <!-- Don't care about coding style for tests -->
-        <sonar.skip>true</sonar.skip>
-    </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>${project.groupId}</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>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-testbench-api</artifactId>
-            <version>${project.version}</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>

uitest/pom.xml

@@ -184,13 +184,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>vaadin-uitest-common</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.jcraft</groupId>
             <artifactId>jsch</artifactId>
@@ -228,6 +221,14 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-testbench-api</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        
     </dependencies>
 
     <build>