Publish zip also (#9299)

diff --git a/all/build.xml b/all/build.xml
index 4e0b2293a9cf3bde3ea8deb9087158eb526c40f3..d5b9b5fd839cbd1fba51f1b25ddcf9774c8c4d70 100644 (file)
--- a/all/build.xml
+++ b/all/build.xml
@@ -8,10 +8,10 @@
        <include file="../build.xml" as="vaadin" />
 
        <!-- global properties -->
-       <property name="module.name" value="vaadin" />
+       <property name="module.name" value="vaadin-all" />
        <property name="result.dir" value="result" />
        <property name="temp.dir" location="${result.dir}/temp" />
-       <property name="zip.file" location="${result.dir}/lib/vaadin-${vaadin.version}.zip" />
+       <property name="zip.file" location="${result.dir}/lib/${module.name}-${vaadin.version}.zip" />
 
        <target name="fetch.module.and.dependencies">
                <fail unless="module" message="No 'module' parameter given" />

diff --git a/all/ivy.xml b/all/ivy.xml
index 93ca988d451f9713ac83ef13327ca289a2b6d512..4450eb168f5a25f4b3ec6815442d2f33d13ff363 100644 (file)
--- a/all/ivy.xml
+++ b/all/ivy.xml
@@ -4,7 +4,7 @@
     xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
     xmlns:m="http://ant.apache.org/ivy/maven">
 
-    <info organisation="com.vaadin" module="vaadin" revision="${vaadin.version}" />
+    <info organisation="com.vaadin" module="vaadin-all" revision="${vaadin.version}" />
 
     <configurations>
         <conf name="build" />

diff --git a/common.xml b/common.xml
index 1bfe2736af7a7e439c5f4de33aad56953f545bd1..96a2a701b2729ad2963cffcfb6530ebd6aa45a06 100644 (file)
--- a/common.xml
+++ b/common.xml
@@ -4,7 +4,7 @@
        <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" />
+       <property name="modules.to.publish" value="shared,server,client,client-compiler,client-compiled,theme-compiler,themes-compiled, all" />
 
        <ivy:resolve file="${vaadin.basedir}/build/ivy/ivy.xml" conf="taskdefs" />
        <ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" />

diff --git a/server/ivy.xml b/server/ivy.xml
index 99e5ae78111116ab46fcc3332b9ecdebbd6233bf..acc384ea30b55141486fcce877cb66a0cd317f38 100644 (file)
--- a/server/ivy.xml
+++ b/server/ivy.xml
@@ -14,11 +14,11 @@
         <conf name="tests" visibility="private" />
     </configurations>
     <publications>
-        <artifact type="jar" ext="jar"/>
-<artifact type="source" ext="jar" m:classifier="sources" />
-<artifact type="javadoc" ext="jar" m:classifier="javadoc" />
-                <artifact type="pom" ext="pom"/>
-                    </publications>
+        <artifact type="jar" ext="jar" />
+        <artifact type="source" ext="jar" m:classifier="sources" />
+        <artifact type="javadoc" ext="jar" m:classifier="javadoc" />
+        <artifact type="pom" ext="pom" />
+    </publications>
     <dependencies>
         <!-- API DEPENDENCIES -->