From 6da3cd640d404965405d24dd515db90e57c8ad76 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 5 Sep 2012 10:29:34 +0300
Subject: Build javadoc and sources jars (#9299)

---
 build.properties          |  2 --
 buildhelpers/ivy.xml      |  4 ++--
 client-compiled/ivy.xml   | 12 ++++++++----
 client-compiler/build.xml | 15 +++++++++------
 client-compiler/ivy.xml   | 13 ++++++++-----
 client/build.xml          |  3 +++
 client/ivy.xml            |  5 ++++-
 common.xml                | 22 ++++++++++++++++++----
 ivysettings.xml           |  2 +-
 pom-template.xml          |  2 +-
 server/build.xml          |  3 +++
 server/ivy.xml            |  5 ++++-
 shared/build.xml          |  3 +++
 shared/ivy.xml            |  5 ++++-
 theme-compiler/build.xml  |  3 +++
 theme-compiler/ivy.xml    |  7 ++++---
 themes-compiled/ivy.xml   | 11 +++++++----
 uitest/ivy.xml            |  3 ++-
 18 files changed, 84 insertions(+), 36 deletions(-)

diff --git a/build.properties b/build.properties
index f5682be0a0..fb08ef6690 100644
--- a/build.properties
+++ b/build.properties
@@ -5,5 +5,3 @@ vaadin.vendor=Vaadin Ltd
 vaadin.java.version=1.6
 vaadin.version=0.0.0.unversioned-development-build
 
-# repository into which Maven snapshots should be published 
-snapshot.repository.url=http://oss.sonatype.org/content/repositories/vaadin-snapshots
diff --git a/buildhelpers/ivy.xml b/buildhelpers/ivy.xml
index 9d74b56f59..ba44ebfc3f 100644
--- a/buildhelpers/ivy.xml
+++ b/buildhelpers/ivy.xml
@@ -22,8 +22,8 @@
     </configurations>
     <publications>
         <artifact type="jar" />
-        <!-- <artifact type="source" ext="jar" m:classifier="sources" /> -->
-        <!-- <artifact type="javadoc" ext="jar" m:classifier="javadoc" /> -->
+        <artifact type="source" ext="jar" m:classifier="sources" />
+        <artifact type="javadoc" ext="jar" m:classifier="javadoc" />
         <artifact type="pom" ext="pom" />
 
     </publications>
diff --git a/client-compiled/ivy.xml b/client-compiled/ivy.xml
index bddabc8bb8..a136929929 100644
--- a/client-compiled/ivy.xml
+++ b/client-compiled/ivy.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivy-module version="2.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+    xmlns:m="http://ant.apache.org/ivy/maven">
 
     <info organisation="com.vaadin" module="vaadin-client-compiled"
         revision="${vaadin.version}" />
 
     <configurations>
         <conf name="build" />
+        <conf name="build-provided" />
         <conf name="compile-module" visibility="private" />
     </configurations>
     <publications>
-        <artifact type="jar" ext="jar"/>
-        <artifact type="pom" ext="pom"/>
-                <!-- cache must be a separate artifact, not within vaadin-client-compiled -->
+        <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" />
+        <!-- cache must be a separate artifact, not within vaadin-client-compiled -->
         <!-- <artifact type="jar" name="vaadin-client-compiled-cache"/> -->
     </publications>
     <dependencies>
diff --git a/client-compiler/build.xml b/client-compiler/build.xml
index fd29e8ed02..97645ea51c 100644
--- a/client-compiler/build.xml
+++ b/client-compiler/build.xml
@@ -25,12 +25,12 @@
 	<target name="jar">
 		<!-- Get Git revision -->
 		<exec executable="git" outputproperty="git.revision" failifexecutionfails="false" errorproperty="">
-			 <arg value="describe"/>
-			 <arg value="--tags"/>
-			 <arg value="--always"/>
-			 <arg value="HEAD"/>
-		</exec> 
-		 
+			<arg value="describe"/>
+			<arg value="--tags"/>
+			<arg value="--always"/>
+			<arg value="HEAD"/>
+		</exec>
+
 		<echo file="${result.dir}/com/google/gwt/dev/About.properties">gwt.version=${vaadin.version}
 gwt.svnrev=${git.revision}</echo>
 
@@ -40,6 +40,9 @@ gwt.svnrev=${git.revision}</echo>
 	</target>
 
 	<target name="publish-local" depends="jar">
+		<antcall target="common.sources.jar" />
+		<antcall target="common.javadoc.jar" />
+
 		<antcall target="common.publish-local" />
 	</target>
 
diff --git a/client-compiler/ivy.xml b/client-compiler/ivy.xml
index 8c991b2223..d824f503b2 100644
--- a/client-compiler/ivy.xml
+++ b/client-compiler/ivy.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivy-module version="2.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+    xmlns:m="http://ant.apache.org/ivy/maven">
 
     <info organisation="com.vaadin" module="vaadin-client-compiler"
         revision="${vaadin.version}" />
@@ -9,12 +10,14 @@
     <configurations>
         <conf name="build" />
         <conf name="build-provided" />
-        <conf name="ide" visibility="private"/>
+        <conf name="ide" visibility="private" />
     </configurations>
     <publications>
-        <artifact type="jar" ext="jar"/>
-                <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>
         <dependency org="com.vaadin" name="vaadin-shared"
             rev="${vaadin.version}"></dependency>
diff --git a/client/build.xml b/client/build.xml
index de1b5444a8..f0ee0892f9 100644
--- a/client/build.xml
+++ b/client/build.xml
@@ -28,6 +28,9 @@
 	</target>
 
 	<target name="publish-local" depends="jar">
+		<antcall target="common.sources.jar" />
+		<antcall target="common.javadoc.jar" />
+
 		<antcall target="common.publish-local" />
 	</target>
 
diff --git a/client/ivy.xml b/client/ivy.xml
index 52706b4ed9..39ed494d86 100644
--- a/client/ivy.xml
+++ b/client/ivy.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivy-module version="2.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+    xmlns:m="http://ant.apache.org/ivy/maven">
 
     <info organisation="com.vaadin" module="vaadin-client"
         revision="${vaadin.version}" />
@@ -14,6 +15,8 @@
     </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>
     <dependencies defaultconf="build" defaultconfmapping="build,ide->default">
diff --git a/common.xml b/common.xml
index c457d827a9..efaf47d30d 100644
--- a/common.xml
+++ b/common.xml
@@ -1,8 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="common" basedir="." default="" xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="common" basedir="." default="" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:antcontrib="antlib:net.sf.antcontrib">
+
 	<dirname property="vaadin.basedir" file="${ant.file.common}" />
 	<property file="${vaadin.basedir}/build.properties" />
-	<ivy:settings file="${vaadin.basedir}/ivysettings.xml" />
+
+	<ivy:resolve file="${vaadin.basedir}/build/ivy/ivy.xml" conf="taskdefs" />
+	<ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" />
+	<taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml" classpathref="taskdefs.classpath" />
+	<!-- ant contrib for Maven integration -->
+	<taskdef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" />
+
+	<!-- FIXME These are not available in other files -->
+	<antcontrib:propertyregex property="vaadin.version.major" input="${version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\1" />
+	<antcontrib:propertyregex property="vaadin.version.minor" input="${version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\2" />
+	<antcontrib:propertyregex property="vaadin.version.revision" input="${version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\3" />
+
+	<ivy:settings file="${vaadin.basedir}/ivysettings.xml" id="ivysettings" />
 
 	<union id="empty.reference" />
 
@@ -22,6 +35,7 @@
 		<property name="ivy.xml" location="${result.dir}/../ivy.xml" />
 		<property name="pom.xml" location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" />
 		<property name="conf" value="build, build-provided" />
+		<property name="vaadin.maven.version" value="${vaadin.version.major}.${vaadin.version.minor}-SNAPSHOT" />
 
 		<ivy:makepom templatefile="${vaadin.basedir}/pom-template.xml" ivyfile="${ivy.xml}" pomfile="${pom.xml}" conf="${conf}">
 			<mapping conf="build" scope="compile" />
@@ -205,12 +219,12 @@
 		<property name="conf" value="*(public)" />
 
 		<ivy:resolve conf="${conf}" />
-		<ivy:publish conf="${conf}" resolver="build-temp" overwrite="true" forcedeliver="true">
+		<ivy:publish settingsref="ivysettings" conf="${conf}" resolver="build-temp" overwrite="true" forcedeliver="true">
 			<!--			<artifacts pattern="${result.dir}/[artifact]-[revision].[ext]" />-->
 			<artifacts pattern="${result.dir}/lib/[artifact]-[revision](-[classifier]).[ext]" />
 
 		</ivy:publish>
-		<ivy:publish conf="${conf}" resolver="local-maven" overwrite="true">
+		<ivy:publish settingsref="ivysettings" conf="${conf}" resolver="local-maven" overwrite="true">
 			<artifacts pattern="${result.dir}/lib/[artifact]-[revision](-[classifier]).[ext]" />
 		</ivy:publish>
 	</target>
diff --git a/ivysettings.xml b/ivysettings.xml
index 5940218108..487fc921df 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -28,7 +28,7 @@
             <ivy
                 pattern="${ivy.settings.dir}/result/artifacts/[revision]/[module]/ivy-[revision].xml" />
             <artifact
-                pattern="${ivy.settings.dir}/result/artifacts/[revision]/[module]/[artifact]-[revision].[ext]" />
+                pattern="${ivy.settings.dir}/result/artifacts/[revision]/[module]/[artifact]-[revision](-[classifier]).[ext]" />
         </filesystem>
     </resolvers>
     <modules>
diff --git a/pom-template.xml b/pom-template.xml
index cec0ca6dc4..563a5a8e97 100644
--- a/pom-template.xml
+++ b/pom-template.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.vaadin</groupId>
   <artifactId>${module.name}</artifactId>
-  <version>${vaadin.version}</version>
+  <version>${vaadin.maven.version}</version>
   <name>Vaadin</name>
   <organization>
     <name>Vaadin Ltd</name>
diff --git a/server/build.xml b/server/build.xml
index 2763d5ff10..c08df072cd 100644
--- a/server/build.xml
+++ b/server/build.xml
@@ -29,6 +29,9 @@
 	</target>
 
 	<target name="publish-local" depends="jar">
+		<antcall target="common.sources.jar" />
+		<antcall target="common.javadoc.jar" />
+
 		<antcall target="common.publish-local" />
 	</target>
 
diff --git a/server/ivy.xml b/server/ivy.xml
index 1e1b4460d7..99e5ae7811 100644
--- a/server/ivy.xml
+++ b/server/ivy.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivy-module version="2.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+    xmlns:m="http://ant.apache.org/ivy/maven">
 
     <info organisation="com.vaadin" module="vaadin-server"
         revision="${vaadin.version}" />
@@ -14,6 +15,8 @@
     </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>
     <dependencies>
diff --git a/shared/build.xml b/shared/build.xml
index 29f68ef643..d458b57d71 100644
--- a/shared/build.xml
+++ b/shared/build.xml
@@ -22,6 +22,9 @@
 	</target>
 
 	<target name="publish-local" depends="jar">
+		<antcall target="common.sources.jar" />
+		<antcall target="common.javadoc.jar" />
+
 		<antcall target="common.publish-local" />
 	</target>
 		
diff --git a/shared/ivy.xml b/shared/ivy.xml
index 8c344a92e9..413231ab01 100644
--- a/shared/ivy.xml
+++ b/shared/ivy.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivy-module version="2.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+    xmlns:m="http://ant.apache.org/ivy/maven">
 
     <info organisation="com.vaadin" module="vaadin-shared"
         revision="${vaadin.version}" />
@@ -14,6 +15,8 @@
     </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>
     <dependencies>
diff --git a/theme-compiler/build.xml b/theme-compiler/build.xml
index aa378f7769..300f2718aa 100644
--- a/theme-compiler/build.xml
+++ b/theme-compiler/build.xml
@@ -21,6 +21,9 @@
 		</antcall>
 	</target>
 	<target name="publish-local" depends="jar">
+		<antcall target="common.sources.jar" />
+		<antcall target="common.javadoc.jar" />
+
 		<antcall target="common.publish-local" />
 	</target>
 
diff --git a/theme-compiler/ivy.xml b/theme-compiler/ivy.xml
index 06285afaf1..873faa7a84 100644
--- a/theme-compiler/ivy.xml
+++ b/theme-compiler/ivy.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivy-module version="2.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+    xmlns:m="http://ant.apache.org/ivy/maven">
 
     <info organisation="com.vaadin" module="vaadin-theme-compiler"
         revision="${vaadin.version}" />
@@ -15,8 +16,8 @@
     <publications>
         <artifact type="jar" ext="jar"/>
                 <artifact type="pom" ext="pom"/>
-                        <artifact type="sources" ext="jar" />
-        <artifact type="javadoc" ext="jar" />
+<artifact type="source" ext="jar" m:classifier="sources" />
+<artifact type="javadoc" ext="jar" m:classifier="javadoc" />
     </publications>
     <dependencies defaultconf="*->default">
         <!-- LIBRARY DEPENDENCIES (compile time) -->
diff --git a/themes-compiled/ivy.xml b/themes-compiled/ivy.xml
index 6bf7d0d813..ce5260c598 100644
--- a/themes-compiled/ivy.xml
+++ b/themes-compiled/ivy.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivy-module version="2.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+    xmlns:m="http://ant.apache.org/ivy/maven">
 
     <info organisation="com.vaadin" module="vaadin-themes-compiled"
         revision="${vaadin.version}" />
@@ -11,9 +12,11 @@
         <conf name="compile-theme" visibility="private" />
     </configurations>
     <publications>
-        <artifact type="jar" ext="jar"/>
-                <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>
         <dependency org="com.vaadin" name="vaadin-theme-compiler"
             rev="${vaadin.version}" conf="compile-theme->build" />
diff --git a/uitest/ivy.xml b/uitest/ivy.xml
index 563be59b0b..2a9bc6b2ef 100644
--- a/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivy-module version="2.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+    xmlns:m="http://ant.apache.org/ivy/maven">
 
     <info organisation="com.vaadin" module="vaadin-uitest"
         revision="${vaadin.version}" />
-- 
cgit v1.2.3