Added in dbcp and cleanup for signatures, as signing fails when the file already...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@540692 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index f19bed5..b60f50d 100644 (file)
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -47,6 +47,10 @@
   </target>
 
   <target name="maven-deploy" depends="init-maven">
+    <!--cleanup-->
+    <delete file="${pom}.tmp"/>
+    <delete file="${file}.asc"/>
+
     <!--replace the version in the pom-->
     <copy file="${pom}" tofile="${pom}.tmp">
       <filterset>
@@ -54,6 +58,7 @@
       </filterset>
     </copy>
     
+    <!--sign the jar-->
     <exec executable="${maven.gpg.exec}" failonerror="true" inputstring="${maven.gpg.passphrase}">
       <arg value="--passphrase-fd"/>
       <arg value="0"/>
@@ -61,7 +66,8 @@
       <arg value="-b"/>
       <arg value="${file}"/>
     </exec>
-
+    
+    <!--deploy it-->
     <artifact:deploy file="${file}">
         <pom file="${pom}.tmp"/>
         <remoteRepository url="${maven.repo.url}" layout="default">
@@ -86,6 +92,7 @@
     </exec>
     -->
     <delete file="${pom}.tmp"/>
+    <delete file="${file}.asc"/>
   </target>
   
   <target name="generic-deploy" depends="init-maven">