diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2016-03-10 22:40:51 +0200 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2016-03-14 07:59:12 +0200 |
| commit | a6653d3fe49e6a97468ac09f7f2f4d621bea1078 (patch) | |
| tree | 96c82e20ca6551ee4c14c8877f0258b25c63cddf /uitest | |
| parent | f7e57d77ce621ee39167369c31d989edc5633266 (diff) | |
| download | vaadin-framework-a6653d3fe49e6a97468ac09f7f2f4d621bea1078.tar.gz vaadin-framework-a6653d3fe49e6a97468ac09f7f2f4d621bea1078.zip | |
Migrate vaadin-server build to maven
Change-Id: I5c740f4e9cb28103bab199f9a552153d82277e7e
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 0344af0866..3823c937c1 100644 --- a/uitest/build.xml +++ b/uitest/build.xml @@ -36,7 +36,7 @@ <property name="result.dir" location="result" /> <property name="src" location="${result.dir}/../src" /> <property name="classes" location="${result.dir}/classes" /> - <property name="server.test.sources" location="${result.dir}/../../server/tests/src" /> + <property name="server.test.sources" location="${result.dir}/../../server/src/test/java" /> <mkdir dir="${classes}" /> <!-- TODO: Get rid of this --> diff --git a/uitest/ivy.xml b/uitest/ivy.xml index 4939c31d1f..0f2141e00b 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -36,7 +36,7 @@ <!-- LIBRARY DEPENDENCIES (compile time) --> <!-- Project modules --> <dependency org="com.vaadin" name="vaadin-server" - rev="${vaadin.version}" conf="build->build"> + rev="${vaadin.version}" conf="build->default"> <exclude org="javax.servlet"></exclude> <exclude type="pom" /> </dependency> |