diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2016-04-27 10:19:38 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2016-04-27 09:44:43 +0000 |
| commit | 882fc8c78680eedec3a1802cc309339662a4281d (patch) | |
| tree | 2f49204a61b93d222ddc1868e9df674e533e94c4 /uitest/pom.xml | |
| parent | 8aae764b1f048e0d571855aa3b2d67877033b714 (diff) | |
| download | vaadin-framework-882fc8c78680eedec3a1802cc309339662a4281d.tar.gz vaadin-framework-882fc8c78680eedec3a1802cc309339662a4281d.zip | |
Move compiled themes out from resources
Change-Id: Id5cc38c717cd43f8e524db330c205958c8db1e31
Diffstat (limited to 'uitest/pom.xml')
| -rw-r--r-- | uitest/pom.xml | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/uitest/pom.xml b/uitest/pom.xml index 3872312ed6..78e2c0e4ee 100644 --- a/uitest/pom.xml +++ b/uitest/pom.xml @@ -255,23 +255,13 @@ </dependencies> <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/tests-valo*/**</exclude> - </excludes> - </resource> - </resources> - <plugins> <plugin> <groupId>com.vaadin</groupId> <artifactId>vaadin-maven-plugin</artifactId> <configuration> <warSourceDirectory>${project.build.directory}/compile-themes</warSourceDirectory> - <webappDirectory>${project.build.outputDirectory}/VAADIN/widgetsets</webappDirectory> + <webappDirectory>${project.build.directory}/${project.build.finalName}/VAADIN/widgetsets</webappDirectory> <persistentunitcachedir>${project.build.directory}/gwt-unitCache</persistentunitcachedir> </configuration> <executions> @@ -303,11 +293,8 @@ <outputDirectory>${project.build.directory}/compile-themes</outputDirectory> <resources> <resource> - <directory>src/main/resources</directory> + <directory>src/main/themes</directory> <filtering>false</filtering> - <includes> - <include>**/tests-valo*/**</include> - </includes> </resource> </resources> </configuration> @@ -319,7 +306,7 @@ <goal>copy-resources</goal> </goals> <configuration> - <outputDirectory>${project.build.outputDirectory}</outputDirectory> + <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory> <resources> <resource> <directory>${project.build.directory}/compile-themes</directory> |