From 40688a759588d0305ae839b4daa14c11f03f9420 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Tue, 8 Feb 2011 15:37:06 +0000
Subject: QPID-1916: default to using a local repo in the scratch dir
 (configurable with maven.local.repo), generate poms into the scratch dir,
 make the artifacts a SNAPSHOT version by default (configurable with
 maven.snapshot), and tweak the SNAPSHOT output version naming not to be
 unique (configurable with maven.unique.version)

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1068445 13f79535-47bb-0310-9956-ffa450edef68
---
 java/common.xml |  7 +++++++
 java/module.xml | 13 ++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'java')

diff --git a/java/common.xml b/java/common.xml
index b1f28dc062..066859b29f 100644
--- a/java/common.xml
+++ b/java/common.xml
@@ -70,6 +70,13 @@
     </fileset>
   </path>
 
+  <property name="maven.local.repo"      value="${build.scratch}/maven-local-repo"/>
+  <property name="maven.unique.version"  value="false"/>
+  <property name="maven.snapshot"        value="true"/>
+  <condition property="maven.version.suffix" value="" else="-SNAPSHOT">
+    <isfalse value="${maven.snapshot}"/>
+  </condition>
+
   <macrodef name="indirect">
     <attribute name="name"/>
     <attribute name="variable"/>
diff --git a/java/module.xml b/java/module.xml
index 877ca130af..d3954a1544 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -219,10 +219,10 @@
       <args>
         <arg line='"${project.root}/genpom"'/>
         <arg line='-s "${project.root}/lib/poms"'/>
-        <arg line='-o "${build}/qpid-${module.name}.pom"'/>
+        <arg line='-o "${build.scratch}/qpid-${module.name}.pom"'/>
         <arg line="-u http://qpid.apache.org"/>
         <arg line="-g org.apache.qpid"/>
-        <arg line="-v ${project.version}"/>
+        <arg line="-v ${project.version}${maven.version.suffix}"/>
         <arg line="-p qpid"/>
         <arg line='-m "${module.depends}"'/>
         <arg line="-a ${module.name}"/>
@@ -235,12 +235,15 @@
   <target name="release-mvn" depends="pom" if="module.genpom" description="Install the artifacts into the local repository and prepare the release">
     <antcall target="build"/>
 
-    <artifact:pom id="module.pom" file="${build}/qpid-${module.name}.pom"/>
+    <artifact:pom id="module.pom" file="${build.scratch}/qpid-${module.name}.pom"/>
 
-    <artifact:install file="${module.jar}" pomRefId="module.pom"/>
+    <artifact:install file="${module.jar}" pomRefId="module.pom">
+        <localRepository path="${maven.local.repo}"/>
+    </artifact:install>
 
-    <artifact:deploy file="${module.jar}" pomRefId="module.pom">
+    <artifact:deploy file="${module.jar}" pomRefId="module.pom" uniqueVersion="${maven.unique.version}">
       <attach file="${module.source.jar}" classifier="sources"/>
+      <localRepository path="${maven.local.repo}"/>
       <remoteRepository url="file://${module.release.base}/maven"/>
     </artifact:deploy>
   </target>
-- 
cgit v1.2.1