diff options
| author | Henri Sara <hesara@vaadin.com> | 2015-03-26 13:25:57 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2015-03-30 14:59:03 +0300 |
| commit | aae4fde317b22f09554f8b810eb244f250c08d80 (patch) | |
| tree | c6f18070528722cb4fdbbdeb230c9852d12195cb /all | |
| parent | 0c3b6077d8dbaab9dd951271e140cd8321c47d9a (diff) | |
| download | vaadin-framework-aae4fde317b22f09554f8b810eb244f250c08d80.tar.gz vaadin-framework-aae4fde317b22f09554f8b810eb244f250c08d80.zip | |
Fix build scripts for BOM (#17025)
Change-Id: Ia59a2423d8e22e15a978dd73baf08b5fa6388ea6
Diffstat (limited to 'all')
| -rw-r--r-- | all/build.xml | 4 | ||||
| -rw-r--r-- | all/ivy.xml | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/all/build.xml b/all/build.xml index 37f728e529..c3672fc828 100644 --- a/all/build.xml +++ b/all/build.xml @@ -50,7 +50,7 @@ </then> <else> <!-- Unpack all source files to javadoc.temp.dir --> - <antcontrib:foreach list="${modules.to.publish.to.maven}" + <antcontrib:foreach list="${modules.producing.jar}" target="unzip.to.javadoctemp" param="module" /> <property name="javadoc.dir" location="${result.dir}/javadoc" /> @@ -88,7 +88,7 @@ <target name="copy-jars"> <delete dir="${temp.dir}" /> - <antcontrib:foreach list="${modules.to.publish.to.maven}" + <antcontrib:foreach list="${modules.producing.jar}" target="fetch.module.and.dependencies" param="module" /> <!-- All jars are now in temp.dir. Still need to separate vaadin and deps --> diff --git a/all/ivy.xml b/all/ivy.xml index cea833731a..156588485f 100644 --- a/all/ivy.xml +++ b/all/ivy.xml @@ -32,7 +32,6 @@ rev="${vaadin.version}" /> <dependency org="com.vaadin" name="vaadin-push" rev="${vaadin.version}" /> <dependency org="com.vaadin" name="vaadin-widgets" rev="${vaadin.version}" /> - <dependency org="com.vaadin" name="vaadin-bom" rev="${vaadin.version}" /> </dependencies> |