Publish all javadoc as an artifact and build as part of the all module (#9745)

Change-Id: I2d5ce81a2b9170eb7c9b91e37d0cf39d5383457c

diff --git a/all/build.xml b/all/build.xml
index d8bc535bb43e2efa729d2cc67eee7283f8df3163..8f60703be62eccf756eaadb8735a51c43681250f 100644 (file)
--- a/all/build.xml
+++ b/all/build.xml
@@ -10,7 +10,7 @@
        <!-- global properties -->
        <property name="module.name" value="vaadin-all" />
        <property name="result.dir" value="result" />
-       <property name="javadoc.jar" location="${result.dir}/vaadin-all-${vaadin.version}-javadoc.jar" />
+       <property name="javadoc.jar" location="${result.dir}/lib/vaadin-all-${vaadin.version}-javadoc.jar" />
        <property name="temp.dir" location="${result.dir}/temp" />
        <property name="temp.deps.dir" value="${temp.dir}/lib" />
        <property name="javadoc.temp.dir" location="${result.dir}/javadoc-temp" />
@@ -75,7 +75,7 @@
 
 
        </target>
-       <target name="zip" depends="copy-jars">
+       <target name="zip" depends="copy-jars, javadoc">
                <zip destfile="${zip.file}">
                        <fileset dir="${temp.dir}">
                                <!-- Avoid conflicts with servlet and portlet API. They are provided by the container -->

diff --git a/all/ivy.xml b/all/ivy.xml
index aebba5ba35307bda5c05dfea1f79a4eb33c63442..103d65e812854c8e87bb8098e81269d071e0dca2 100644 (file)
--- a/all/ivy.xml
+++ b/all/ivy.xml
@@ -11,6 +11,7 @@
     </configurations>
     <publications>
         <artifact type="zip" ext="zip" />
+        <artifact type="javadoc" ext="jar" m:classifier="javadoc" />
     </publications>
     <dependencies defaultconf="build">
         <!-- API DEPENDENCIES -->