Fix build scripts for BOM (#17025)

Change-Id: Ia59a2423d8e22e15a978dd73baf08b5fa6388ea6

diff --git a/all/build.xml b/all/build.xml
index 37f728e529b275adc13f33dd9c7df7a4853e9ca7..c3672fc828bf35c6f545c0de97fd5bcf6c60d52c 100644 (file)
--- 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 cea833731ad894a50ab60da10528a2ac603f154e..156588485f28d06bb073a29a7020a7d380b3caca 100644 (file)
--- 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 feb3381607cda6789a159f8c304c2cccd3863d8a..075044bb5b27137aa1ac7fa240e0002dcc3419b0 100644 (file)
--- 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" />