diff options
| author | Henri Sara <hesara@vaadin.com> | 2015-03-26 13:25:57 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-03-26 13:22:07 +0000 |
| commit | b826bb17ee3349bbaa4ac67526315427a716a62d (patch) | |
| tree | 54ffb19e44324e4d4c8f12ce4b03ce0a8939491c | |
| parent | 6e208eb77a248c5f5b1baa055ded94a43b0c96ed (diff) | |
| download | vaadin-framework-b826bb17ee3349bbaa4ac67526315427a716a62d.tar.gz vaadin-framework-b826bb17ee3349bbaa4ac67526315427a716a62d.zip | |
Fix build scripts for BOM (#17025)
Change-Id: Ia59a2423d8e22e15a978dd73baf08b5fa6388ea6
| -rw-r--r-- | all/build.xml | 4 | ||||
| -rw-r--r-- | all/ivy.xml | 1 | ||||
| -rw-r--r-- | common.xml | 3 |
3 files changed, 4 insertions, 4 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> diff --git a/common.xml b/common.xml index feb3381607..075044bb5b 100644 --- a/common.xml +++ b/common.xml @@ -9,7 +9,8 @@ <property name="gwt.basedir" location="${vaadin.basedir}/../gwt" /> <property file="${vaadin.basedir}/build.properties" /> - <property name="modules.to.publish.to.maven" value="shared,server,client,client-compiler,client-compiled,themes,push,widgets,bom" /> + <property name="modules.producing.jar" value="shared,server,client,client-compiler,client-compiled,themes,push,widgets" /> + <property name="modules.to.publish.to.maven" value="${modules.producing.jar},bom" /> <property name="modules.to.publish.to.download" value="${modules.to.publish.to.maven},all" /> <ivy:settings file="${vaadin.basedir}/ivysettings.xml" /> |