Browse Source

Use parameter for uitest Ivy repository

This allows CI builds to override the repository for Vaadin artifacts.

Change-Id: I0a85c16f1630ec8a3d29bd0ff42d7855f360ff88
tags/7.7.0.alpha1
Henri Sara 8 years ago
parent
commit
c162767ef3
2 changed files with 21 additions and 12 deletions
  1. 18
    12
      ivysettings.xml
  2. 3
    0
      uitest/build.xml

+ 18
- 12
ivysettings.xml View File

@@ -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>



+ 3
- 0
uitest/build.xml View File

@@ -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>


Loading…
Cancel
Save