Avoid publishing 'all' zip to Maven (#9299)

diff --git a/all/build.xml b/all/build.xml
index 8e4f8cdd8a18f214e66fae1cb29841ded7fcce2c..0ffde57bb420096d882712b06978da6b77ef2817 100644 (file)
--- a/all/build.xml
+++ b/all/build.xml
@@ -16,22 +16,15 @@
        <target name="fetch.module.and.dependencies">
                <fail unless="module" message="No 'module' parameter given" />
 
-               <antcontrib:if>
-                       <not>
-                               <equals arg1="${module}" arg2="all" />
-                       </not>
-                       <then>
-                               <ivy:cachepath pathid="module.and.deps" inline="true" organisation="com.vaadin" module="vaadin-${module}" revision="${vaadin.version}" />
-                               <copy todir="${temp.dir}" flatten="true">
-                                       <path refid="module.and.deps" />
-                               </copy>
-                       </then>
-               </antcontrib:if>
+               <ivy:cachepath pathid="module.and.deps" inline="true" organisation="com.vaadin" module="vaadin-${module}" revision="${vaadin.version}" />
+               <copy todir="${temp.dir}" flatten="true">
+                       <path refid="module.and.deps" />
+               </copy>
        </target>
 
        <target name="zip">
                <delete dir="${temp.dir}" />
-               <antcontrib:foreach list="${modules.to.publish}" target="fetch.module.and.dependencies" param="module" />
+               <antcontrib:foreach list="${modules.to.publish.to.maven}" target="fetch.module.and.dependencies" param="module" />
                <!-- All jars are now in temp.dir. Still need to separate vaadin and deps -->
                <move todir="${temp.dir}/deps">
                        <fileset dir="${temp.dir}">

diff --git a/common.xml b/common.xml
index 40566a9bcec6a0b9ec6dd21d6279f7bdf8b60cbb..d2c6d7142a2fa7ee2717ef07c5ffa43fc3ccdad5 100644 (file)
--- a/common.xml
+++ b/common.xml
@@ -4,7 +4,8 @@
        <dirname property="vaadin.basedir" file="${ant.file.common}" />
        <property file="${vaadin.basedir}/build.properties" />
 
-       <property name="modules.to.publish" value="shared,server,client,client-compiler,client-compiled,theme-compiler,themes-compiled,all" />
+       <property name="modules.to.publish.to.maven" value="shared,server,client,client-compiler,client-compiled,theme-compiler,themes-compiled" />
+       <property name="modules.to.publish.to.download" value="${modules.to.publish.to.maven},all" />
 
        <ivy:resolve file="${vaadin.basedir}/build/ivy/ivy.xml" conf="taskdefs" />
        <ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" />

diff --git a/publish.xml b/publish.xml
index 0e536d49531c00de33e397962d645bd990e3e1c2..61638851cd0acfcde1da3b3bf7ddd95e1851ad8e 100644 (file)
--- a/publish.xml
+++ b/publish.xml
@@ -32,11 +32,11 @@
        </target>
 
        <target name="nightly.download.publish">
-               <antcontrib:foreach list="${modules.to.publish}" target="publish.module.to.download.site" param="module" />
+               <antcontrib:foreach list="${modules.to.publish.to.download}" target="publish.module.to.download.site" param="module" />
        </target>
 
        <target name="nightly.maven.publish">
-               <antcontrib:foreach list="${modules.to.publish}" target="publish.module.to.maven" param="module" />
+               <antcontrib:foreach list="${modules.to.publish.to.maven}" target="publish.module.to.maven" param="module" />
        </target>
 
        <target name="publish.module.to.download.site">