Generate pom artifacts and automatically publish to local Maven (#9299)

buildhelpers/ivy.xml

@@ -17,13 +17,15 @@
     <configurations>
         <conf name="build" />
         <conf name="build-provided" />
-        <conf name="ide" visibility="private"/>
+        <conf name="ide" visibility="private" />
         <conf name="tests" />
     </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>
     <dependencies />
 

client-compiled/build.xml

@@ -94,7 +94,6 @@
 		<jar file="${compiled-cache.jar}" compress="true">
 			<fileset dir="${gwtar.dir}">
 				<include name="**/*.gwtar" />
-				<include name="pom.xml" />
 			</fileset>
 			<union refid="client-compiled-cache.gwt.includes" />
 			<fileset refid="common.files.for.all.jars" />
@@ -115,7 +114,6 @@
 			</manifest>
 			<fileset dir="${result.dir}">
 				<include name="VAADIN/widgetsets/com.vaadin*/**" />
-				<include name="pom.xml" />
 			</fileset>
 			<fileset refid="common.files.for.all.jars" />
 		</jar>
@@ -123,7 +121,7 @@
 
 	</target>
 
-	<target name="publish-local" depends="client-compiled.jar, client-compiled-cache.jar">
+	<target name="publish-local" depends="client-compiled.jar">
 		<antcall target="common.publish-local">
 			<param name="conf" value="build" />
 		</antcall>

client-compiled/ivy.xml

@@ -11,8 +11,9 @@
         <conf name="compile-module" visibility="private" />
     </configurations>
     <publications>
-        <artifact type="jar" name="vaadin-client-compiled" />
-        <!-- cache must be a separate artifact, not within vaadin-client-compiled -->
+        <artifact type="jar" ext="jar"/>
+        <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>

client-compiler/ivy.xml

@@ -12,8 +12,9 @@
         <conf name="ide" visibility="private"/>
     </configurations>
     <publications>
-        <artifact></artifact>
-    </publications>
+        <artifact type="jar" ext="jar"/>
+                <artifact type="pom" ext="pom"/>
+                    </publications>
     <dependencies>
         <dependency org="com.vaadin" name="vaadin-shared"
             rev="${vaadin.version}"></dependency>

client/ivy.xml

@@ -13,7 +13,8 @@
         <conf name="tests" />
     </configurations>
     <publications>
-        <artifact></artifact>
+        <artifact type="jar" ext="jar"/>
+        <artifact type="pom" ext="pom"/>
     </publications>
     <dependencies defaultconf="build" defaultconfmapping="build,ide->default">
         <!-- API DEPENDENCIES -->

common.xml

@@ -20,7 +20,7 @@
 	<target name="pom.xml" description="Generates a pom.xml based on the Ivy configuration">
 		<fail unless="result.dir" message="No result.dir parameter given" />
 		<property name="ivy.xml" location="${result.dir}/../ivy.xml" />
-		<property name="pom.xml" location="${result.dir}/pom.xml" />
+		<property name="pom.xml" location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" />
 		<property name="conf" value="build, build-provided" />
 
 		<ivy:makepom templatefile="${vaadin.basedir}/pom-template.xml" ivyfile="${ivy.xml}" pomfile="${pom.xml}" conf="${conf}">
@@ -86,7 +86,6 @@
 			<fileset dir="${classes}" excludes="${classes.exclude}" />
 			<fileset dir="${src}" excludes="${jar.exclude}" />
 			<fileset refid="common.files.for.all.jars" />
-			<fileset file="${pom.xml}" />
 			<union refid="extra.jar.includes" />
 		</union>
 		<jar destfile="${result.jar}" duplicate="fail" index="true">
@@ -211,5 +210,16 @@
 			<artifacts pattern="${result.dir}/lib/[artifact]-[revision](-[classifier]).[ext]" />
 
 		</ivy:publish>
+		<ivy:publish conf="${conf}" resolver="local-maven" overwrite="true">
+			<artifacts pattern="${result.dir}/lib/[artifact]-[revision](-[classifier]).[ext]" />
+		</ivy:publish>
+	</target>
+
+	<target name="publish.to.local.maven">
+		<property name="conf" value="*(public)" />
+
+		<ivy:resolve conf="${conf}" />
+		<ivy:publish conf="${conf}" resolver="local-maven" overwrite="true">
+		</ivy:publish>
 	</target>
 </project>

ivysettings.xml

@@ -11,6 +11,10 @@
     <settings defaultResolver="public" />
     <resolvers>
         <ibiblio name="public" m2compatible="true" />
+        <filesystem name="local-maven" m2compatible="true">
+            <artifact
+                pattern="${user.home}/.m2/repository/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]" />
+        </filesystem>
         <dual name="custom-smartsprites">
             <filesystem name="smartsprites-ivy">
                 <ivy pattern="${basedir}/ivymodule/[module]-ivy-[revision].xml" />

server/ivy.xml

@@ -13,8 +13,9 @@
         <conf name="tests" visibility="private" />
     </configurations>
     <publications>
-        <artifact></artifact>
-    </publications>
+        <artifact type="jar" ext="jar"/>
+                <artifact type="pom" ext="pom"/>
+                    </publications>
     <dependencies>
         <!-- API DEPENDENCIES -->
 

shared/ivy.xml

@@ -13,8 +13,9 @@
         <conf name="tests" />
     </configurations>
     <publications>
-        <artifact></artifact>
-    </publications>
+        <artifact type="jar" ext="jar"/>
+                <artifact type="pom" ext="pom"/>
+                    </publications>
     <dependencies>
     </dependencies>
 

theme-compiler/ivy.xml

@@ -13,8 +13,9 @@
         <conf name="tests" />
     </configurations>
     <publications>
-        <artifact type="jar" />
-        <artifact type="sources" ext="jar" />
+        <artifact type="jar" ext="jar"/>
+                <artifact type="pom" ext="pom"/>
+                        <artifact type="sources" ext="jar" />
         <artifact type="javadoc" ext="jar" />
     </publications>
     <dependencies defaultconf="*->default">

themes-compiled/build.xml

@@ -41,7 +41,8 @@
 		<property name="result.dir" location="result" />
 		<property name="result.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
 		<property name="classes" location="{$result.dir}/classes" />
-
+		<antcall target="common.pom.xml" />
+		
 		<jar jarfile="${result.jar}">
 			<fileset dir="${result.dir}">
 				<include name="VAADIN/themes/**" />

themes-compiled/ivy.xml

@@ -11,8 +11,9 @@
         <conf name="compile-theme" visibility="private" />
     </configurations>
     <publications>
-        <artifact type="jar"></artifact>
-    </publications>
+        <artifact type="jar" ext="jar"/>
+                <artifact type="pom" ext="pom"/>
+                    </publications>
     <dependencies>
         <dependency org="com.vaadin" name="vaadin-theme-compiler"
             rev="${vaadin.version}" conf="compile-theme->build" />

uitest/build.xml

@@ -50,7 +50,7 @@
 	</target>
 
 	<target name="testing-widgetset" depends="dependencies,compile">
-		<property name="module" value="com.vaadin.tests.widgetset.TestingWidgetSet"/>
+		<property name="module" value="com.vaadin.tests.widgetset.TestingWidgetSet" />
 		<property name="style" value="OBF" />
 		<property name="localWorkers" value="2" />
 		<property name="extraParams" value="" />

uitest/ivy.xml

@@ -13,8 +13,8 @@
         <conf name="jetty-run" extends="build" visibility="private" />
     </configurations>
     <publications>
-        <artifact type="war" />
-    </publications>
+        <artifact type="war" ext="war"/>
+                   </publications>
     <dependencies defaultconf="build" defaultconfmapping="build,ide->default">
         <!-- API DEPENDENCIES -->
         <dependency org="javax.portlet" name="portlet-api"