diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2016-03-23 11:57:28 +0200 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2016-03-24 09:51:59 +0200 |
| commit | 7b1a91f9ece0d38c74886383df3ee29d354592f8 (patch) | |
| tree | 071ff5ca5ca7dfb8ee4f50da8788940b046dcf05 /uitest | |
| parent | 7abb4b536dc07ed19c7a1942da68fe5bb00ce4fa (diff) | |
| download | vaadin-framework-7b1a91f9ece0d38c74886383df3ee29d354592f8.tar.gz vaadin-framework-7b1a91f9ece0d38c74886383df3ee29d354592f8.zip | |
Build vaadin-buildhelpers with maven
Change-Id: I1b67fdc7d32d57f98bca78dba4fa190950b94507
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/build.xml | 2 | ||||
| -rw-r--r-- | uitest/ivy.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/uitest/build.xml b/uitest/build.xml index 3823c937c1..279c50baf6 100644 --- a/uitest/build.xml +++ b/uitest/build.xml @@ -132,7 +132,7 @@ </delete> <war destfile="${result.war}" duplicate="fail" index="true"> - <fileset dir="${common.jarfiles.dir}" /> + <!-- <fileset dir="${common.jarfiles.dir}" /> --> <fileset dir="${result.dir}"> <include name="VAADIN/widgetsets/**/*" /> <include name="VAADIN/themes/tests-valo*/**" /> diff --git a/uitest/ivy.xml b/uitest/ivy.xml index a3dfc0e428..7a7df5a81f 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -118,7 +118,7 @@ rev="${vaadin.sass.version}" conf="compile-theme->default" /> <dependency org="com.vaadin" name="vaadin-buildhelpers" - rev="${vaadin.version}" conf="compile-theme->build" /> + rev="${vaadin.version}" conf="compile-theme->default" /> <dependency org="org.eclipse.jgit" name="org.eclipse.jgit" rev="3.5.1.201410131835-r" conf="ide,build->default"> <exclude org="org.apache.httpcomponents"></exclude> |