svn commit: r1408100 - in /qpid/trunk/qpid/java: build.xml common.xml module.xml

[ro...@apache.org]

Author: robbie
Date: Sun Nov 11 19:46:53 2012
New Revision: 1408100

URL: http://svn.apache.org/viewvc?rev=1408100&view=rev
Log:
QPID-4431: add 'deploy-snapshot' target for use in publishing snapshot maven artefacts from CI

Modified:
    qpid/trunk/qpid/java/build.xml
    qpid/trunk/qpid/java/common.xml
    qpid/trunk/qpid/java/module.xml

Modified: qpid/trunk/qpid/java/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.xml?rev=1408100&r1=1408099&r2=1408100&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.xml (original)
+++ qpid/trunk/qpid/java/build.xml Sun Nov 11 19:46:53 2012
@@ -77,6 +77,10 @@
     <iterate target="release-mvn"/>
   </target>
 
+  <target name="deploy-snapshot" description="deploy snapshot artifacts to nexus">
+    <iterate target="deploy-snapshot"/>
+  </target>
+
   <target name="compile" description="compile sources">
     <iterate target="compile"/>
   </target>

Modified: qpid/trunk/qpid/java/common.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common.xml?rev=1408100&r1=1408099&r2=1408100&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common.xml (original)
+++ qpid/trunk/qpid/java/common.xml Sun Nov 11 19:46:53 2012
@@ -93,6 +93,10 @@
   <property name="nexus.host"            value="repository.apache.org"/>
   <property name="nexus.upload.url"      value="https://${nexus.host}/service/local/staging/deploy/maven2"/>
 
+  <!-- properties for deplying snapshot artifacts -->
+  <property name="maven.snapshots.repo.id"     value="apache.snapshots.https"/>
+  <property name="maven.snapshots.repo.url"     value="https://${nexus.host}/content/repositories/snapshots"/>
+
   <!-- properties for downloading ivy, and then our dependencies -->
   <property name="ivy.jar.dir"         value="${project.root}/lib/ivy" />
   <property name="ivy.install.version" value="2.2.0" />

Modified: qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=1408100&r1=1408099&r2=1408100&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Sun Nov 11 19:46:53 2012
@@ -275,9 +275,7 @@
     </jython>
   </target>
 
-  <target name="release-mvn" depends="pom" if="module.genpom" description="Install the artifacts into the local repository and prepare the release">
-    <antcall target="build"/>
-
+  <target name="release-mvn" depends="build,pom" if="module.genpom" description="Install the artifacts into the local repository and prepare the release artifacts">
     <artifact:pom id="module.pom" file="${build.scratch}/qpid-${module.name}.pom"/>
 
     <artifact:install file="${module.jar}" pomRefId="module.pom" settingsFile="${maven.settings.xml}">
@@ -291,6 +289,29 @@
     </artifact:deploy>
   </target>
 
+  <target name="deploy-snapshot" depends="build,pom" if="module.genpom" description="deploy a snapshot build to nexus">
+    <!-- In order to use this target you need to have predefined a username and password for the
+    server with id ${maven.snapshots.repo.id} in your m2 settings file, e.g ~/.m2/settings.xml -->
+    <artifact:pom id="module.pom" file="${build.scratch}/qpid-${module.name}.pom"/>
+
+    <fail message="The pom version must include -SNAPSHOT. Version found was: ${module.pom.version}">
+      <condition>
+        <not>
+          <contains substring="-SNAPSHOT" string="${module.pom.version}" />
+        </not>
+      </condition>
+    </fail>
+
+    <artifact:install file="${module.jar}" pomRefId="module.pom" settingsFile="${maven.settings.xml}">
+        <localRepository path="${maven.local.repo}"/>
+    </artifact:install>
+
+    <artifact:deploy file="${module.jar}" pomRefId="module.pom">
+      <localRepository path="${maven.local.repo}"/>
+      <remoteRepository id="${maven.snapshots.repo.id}" url="${maven.snapshots.repo.url}"/>
+    </artifact:deploy>
+  </target>
+
   <target name="precompile"/>
 
   <target name="compile" depends="prepare,precompile" description="compile sources">



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org