diff options
| author | Artur Signell <artur@vaadin.com> | 2016-08-18 19:32:05 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2016-08-18 20:05:57 +0300 |
| commit | a836efc40cbda8cf0e8548b4b6cf4cf2a0e0026e (patch) | |
| tree | 53aecbb6243ec10ab6e55a83b309ed791dea04ab | |
| parent | e10ec4ca0d5ff06f5dacc790d58c6390ba21675d (diff) | |
| download | vaadin-framework-a836efc40cbda8cf0e8548b4b6cf4cf2a0e0026e.tar.gz vaadin-framework-a836efc40cbda8cf0e8548b4b6cf4cf2a0e0026e.zip | |
Define common test dependencies in the main pom file
Change-Id: I7d5897384f1172befbc852e27a7372104e7820da
| -rw-r--r-- | client-compiler/pom.xml | 5 | ||||
| -rw-r--r-- | client/pom.xml | 13 | ||||
| -rw-r--r-- | pom.xml | 31 | ||||
| -rw-r--r-- | server/pom.xml | 37 | ||||
| -rw-r--r-- | shared/pom.xml | 6 | ||||
| -rw-r--r-- | themes/pom.xml | 6 | ||||
| -rw-r--r-- | uitest-common/pom.xml | 1 | ||||
| -rw-r--r-- | uitest/pom.xml | 10 |
8 files changed, 43 insertions, 66 deletions
diff --git a/client-compiler/pom.xml b/client-compiler/pom.xml index 4b346295a2..35b5ce423a 100644 --- a/client-compiler/pom.xml +++ b/client-compiler/pom.xml @@ -28,11 +28,6 @@ <groupId>com.vaadin</groupId> <artifactId>vaadin-sass-compiler</artifactId> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> diff --git a/client/pom.xml b/client/pom.xml index 9f5a54451e..cf540bd47f 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -36,19 +36,6 @@ </exclusions> </dependency> - <!-- Testing dependencies --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <scope>test</scope> - </dependency> - <!-- Needed GWT dependencies, includes gwt-user --> <dependency> <groupId>com.google.gwt</groupId> @@ -257,8 +257,37 @@ <version>3.5.1.201410131835-r</version> </dependency> </dependencies> - </dependencyManagement> + + <!-- Common test dependencies --> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build> <pluginManagement> <plugins> diff --git a/server/pom.xml b/server/pom.xml index 68db722ef8..f18c275b90 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -82,32 +82,7 @@ <!-- TESTING DEPENDENCIES --> - <!-- Test frameworks & related --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <scope>test</scope> - </dependency> + <!-- Test dependencies --> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> @@ -119,13 +94,13 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> <scope>test</scope> </dependency> @@ -134,7 +109,7 @@ </dependencies> <build> - <plugins> + <plugins> <plugin> <artifactId>maven-resources-plugin</artifactId> <executions> diff --git a/shared/pom.xml b/shared/pom.xml index 1c75c23f1d..4d558ca20e 100644 --- a/shared/pom.xml +++ b/shared/pom.xml @@ -24,12 +24,6 @@ <artifactId>gwt-elemental</artifactId> <scope>provided</scope> </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> diff --git a/themes/pom.xml b/themes/pom.xml index 002e04f726..9bf547396c 100644 --- a/themes/pom.xml +++ b/themes/pom.xml @@ -41,6 +41,12 @@ <artifactId>smartsprites</artifactId> <scope>provided</scope> </dependency> + <!-- smartsprites dependency --> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> diff --git a/uitest-common/pom.xml b/uitest-common/pom.xml index f1d413fb58..07c9ae203e 100644 --- a/uitest-common/pom.xml +++ b/uitest-common/pom.xml @@ -41,6 +41,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>compile</scope> </dependency> <dependency> <groupId>commons-io</groupId> diff --git a/uitest/pom.xml b/uitest/pom.xml index 20e800bdcd..989b58dc9d 100644 --- a/uitest/pom.xml +++ b/uitest/pom.xml @@ -166,16 +166,6 @@ </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> </dependency> |