From 6fbd2a851c9103191d8fcdbcecdffb7fe3c64412 Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Mon, 20 Feb 2012 16:40:05 -0500
Subject: Speed up deployment using combined deploy settings.

---
 src/build/maven/maven-deploy.xml | 46 +++++++++-------------------------------
 1 file changed, 10 insertions(+), 36 deletions(-)

(limited to 'src/build/maven/maven-deploy.xml')

diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml
index 166cbe21ee..fe99e956d9 100644
--- a/src/build/maven/maven-deploy.xml
+++ b/src/build/maven/maven-deploy.xml
@@ -178,7 +178,8 @@
       <attribute name="pom" />
       <attribute name="repository" />
       <attribute name="jar" />
-      <element name="extra-args" optional="yes" />
+      <attribute name="srcjar" />
+      <attribute name="docjar" />
       <sequential>
         <artifact:mvn>
           <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
@@ -186,9 +187,10 @@
           <arg value="-DrepositoryId=${repository.credentials.id}" />
           <arg value="-DpomFile=@{pom}" />
           <arg value="-Dfile=@{jar}" />
+          <arg value="-Dsources=@{srcjar}" />
+          <arg value="-Djavadoc=@{docjar}" />
           <arg value="-Pgpg" />
           <arg value="-Dgpg.useagent=true" />
-          <extra-args/>
         </artifact:mvn>
       </sequential>
     </macrodef>
@@ -202,23 +204,9 @@
         <deploy-remote-signed-single
            pom="@{name}/@{name}-pom-fixed.xml"
            repository="@{repository}"
-           jar="/@{name}/@{name}.jar" />
-        <deploy-remote-signed-single 
-           pom="@{name}/@{name}-pom-fixed.xml"
-           repository="@{repository}"
-           jar="@{name}/@{name}-src.jar">
-          <extra-args>
-            <arg value="-Dclassifier=sources" />
-          </extra-args>
-        </deploy-remote-signed-single>
-        <deploy-remote-signed-single 
-           pom="@{name}/@{name}-pom-fixed.xml"
-           repository="@{repository}"
-           jar="@{name}/@{name}-docs.jar">
-          <extra-args>
-            <arg value="-Dclassifier=javadoc" />
-          </extra-args>
-        </deploy-remote-signed-single>
+           jar="@{name}/@{name}.jar"
+           srcjar="@{name}/@{name}-src.jar"
+           docjar="@{name}/@{name}-docs.jar" />
       </sequential>
     </macrodef>
     <macrodef name="deploy-remote-plugin-signed">
@@ -231,23 +219,9 @@
         <deploy-remote-signed-single
            pom="plugins/@{name}/@{name}-pom-fixed.xml"
            repository="@{repository}"
-           jar="plugins/@{name}/@{name}.jar" />
-        <deploy-remote-signed-single 
-           pom="plugins/@{name}/@{name}-pom-fixed.xml"
-           repository="@{repository}"
-           jar="plugins/@{name}/@{name}-src.jar">
-          <extra-args>
-            <arg value="-Dclassifier=sources" />
-          </extra-args>
-        </deploy-remote-signed-single>
-        <deploy-remote-signed-single 
-           pom="plugins/@{name}/@{name}-pom-fixed.xml"
-           repository="@{repository}"
-           jar="plugins/@{name}/@{name}-docs.jar">
-          <extra-args>
-            <arg value="-Dclassifier=javadoc" />
-          </extra-args>
-        </deploy-remote-signed-single>
+           jar="plugins/@{name}/@{name}.jar"
+           srcjar="plugins/@{name}/@{name}-src.jar"
+           docjar="plugins/@{name}/@{name}-docs.jar" />
       </sequential>
     </macrodef>
     <macrodef name="deploy-remote-signed-all">
-- 
cgit v1.2.3