diff options
| -rw-r--r-- | ivysettings.xml | 30 | ||||
| -rw-r--r-- | uitest/build.xml | 3 |
2 files changed, 21 insertions, 12 deletions
diff --git a/ivysettings.xml b/ivysettings.xml index 4ffc7817c6..3542a3e549 100644 --- a/ivysettings.xml +++ b/ivysettings.xml @@ -19,6 +19,12 @@ <ivy pattern="${user.home}/.m2/repository/[organisation]/[module]/[revision]/[module]-[revision](-[classifier]).pom" /> </filesystem> + <ibiblio name="vaadin-build" usepoms="true" + m2compatible="true" root="${vaadin.build.repository}" /> + <chain name="vaadin-maven" returnFirst="true"> + <resolver ref="local-maven" /> + <resolver ref="vaadin-build" /> + </chain> </resolvers> <modules> <module organisation="com.vaadin" name="vaadin-testbench" @@ -30,29 +36,29 @@ <module organisation="com.vaadin" name="vaadin-testbench-api" resolver="vaadin-addons" /> <module organisation="com.vaadin" name="vaadin-buildhelpers" - resolver="local-maven" /> + resolver="vaadin-maven" /> <module organisation="com.vaadin" name="vaadin-root" - resolver="local-maven" /> + resolver="vaadin-maven" /> <module organisation="com.vaadin" name="vaadin-shared" - resolver="local-maven" /> + resolver="vaadin-maven" /> <module organisation="com.vaadin" name="vaadin-server" - resolver="local-maven" /> + resolver="vaadin-maven" /> <module organisation="com.vaadin" name="vaadin-client" - resolver="local-maven" /> + resolver="vaadin-maven" /> <module organisation="com.vaadin" name="vaadin-client-compiler" - resolver="local-maven" /> + resolver="vaadin-maven" /> <module organisation="com.vaadin" name="vaadin-client-compiled" - resolver="local-maven" /> + resolver="vaadin-maven" /> <module organisation="com.vaadin" name="vaadin-themes" - resolver="local-maven" /> + resolver="vaadin-maven" /> <module organisation="com.vaadin" name="vaadin-push" - resolver="local-maven" /> + resolver="vaadin-maven" /> <module organisation="com.vaadin" name="vaadin-widgets" - resolver="local-maven" /> + resolver="vaadin-maven" /> <module organisation="com.vaadin" name="vaadin-bom" - resolver="local-maven" /> + resolver="vaadin-maven" /> <module organisation="com.vaadin" name="vaadin-liferay" - resolver="local-maven" /> + resolver="vaadin-maven" /> </modules> diff --git a/uitest/build.xml b/uitest/build.xml index 36d097ba82..10f38c7b2c 100644 --- a/uitest/build.xml +++ b/uitest/build.xml @@ -15,6 +15,9 @@ <property name="result.war" location="${result.dir}/lib/${module.name}-${vaadin.version}.war" /> + <!-- Need to give a default value to keep Ivy happy --> + <property name="vaadin.build.repository" value="http://maven.vaadin.com/vaadin-prerelease"/> + <path id="classpath.compile.custom"> </path> |