Author: markt
Date: Tue Jul 13 16:02:09 2010
New Revision: 963776
URL: http://svn.apache.org/viewvc?rev=963776&view=rev
Log:
Sign the pom.
Make sure source jar signature doesn't overwrite the non-source jar signature.
Modified:
tomcat/trunk/res/maven/mvn-pub.xml
Modified: tomcat/trunk/res/maven/mvn-pub.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?rev=963776&r1=963775&r2=963776&view=diff
==============================================================================
--- tomcat/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/trunk/res/maven/mvn-pub.xml Tue Jul 13 16:02:09 2010
@@ -63,6 +63,7 @@
<target name="maven-deploy" depends="init-maven">
<!--cleanup-->
<delete file="${pom}.tmp"/>
+ <delete file="${pom}.asc"/>
<delete file="${file}.asc"/>
<delete file="${src}.asc"/>
@@ -73,7 +74,7 @@
</filterset>
</copy>
- <!--sign the jar-->
+ <!--sign the jar, the source and the pom -->
<exec executable="${maven.gpg.exec}" failonerror="true"
inputstring="${maven.gpg.passphrase}">
<arg value="--passphrase-fd"/>
<arg value="0"/>
@@ -88,6 +89,15 @@
<arg value="-b"/>
<arg value="${src}"/>
</exec>
+ <exec executable="${maven.gpg.exec}" failonerror="true"
inputstring="${maven.gpg.passphrase}">
+ <arg value="--passphrase-fd"/>
+ <arg value="0"/>
+ <arg value="-a"/>
+ <arg value="-b"/>
+ <arg value="-o"/>
+ <arg value="${pom}.asc"/>
+ <arg value="${pom}.tmp"/>
+ </exec>
<!--deploy it-->
<artifact:deploy file="${file}">
@@ -97,10 +107,12 @@
</remoteRepository>
<attach file="${file}.asc" type="jar.asc"/>
<attach file="${src}" classifier="sources" type="jar"/>
- <attach file="${src}.asc" type="jar.asc"/>
+ <attach file="${src}.asc" classifier="sources" type="jar.asc"/>
+ <attach file="${pom}.asc" type="pom.asc"/>
</artifact:deploy>
<delete file="${pom}.tmp"/>
+ <delete file="${pom}.asc"/>
<delete file="${file}.asc"/>
<delete file="${src}.asc"/>
</target>
@@ -128,6 +140,7 @@
<target name="maven-deploy-nosrc" depends="init-maven">
<!--cleanup-->
<delete file="${pom}.tmp"/>
+ <delete file="${pom}.asc"/>
<delete file="${file}.asc"/>
<!--replace the version in the pom-->
@@ -137,7 +150,7 @@
</filterset>
</copy>
- <!--sign the jar-->
+ <!--sign the jar and pom -->
<exec executable="${maven.gpg.exec}" failonerror="true"
inputstring="${maven.gpg.passphrase}">
<arg value="--passphrase-fd"/>
<arg value="0"/>
@@ -145,6 +158,15 @@
<arg value="-b"/>
<arg value="${file}"/>
</exec>
+ <exec executable="${maven.gpg.exec}" failonerror="true"
inputstring="${maven.gpg.passphrase}">
+ <arg value="--passphrase-fd"/>
+ <arg value="0"/>
+ <arg value="-a"/>
+ <arg value="-b"/>
+ <arg value="-o"/>
+ <arg value="${pom}.asc"/>
+ <arg value="${pom}.tmp"/>
+ </exec>
<!--deploy it-->
<artifact:deploy file="${file}">
@@ -153,9 +175,11 @@
<authentication username="${maven.scp.username}"
privateKey="${maven.scp.privateKey}" passphrase="${maven.scp.passphrase}"/>
</remoteRepository>
<attach file="${file}.asc" type="jar.asc"/>
+ <attach file="${pom}.asc" type="pom.asc"/>
</artifact:deploy>
<delete file="${pom}.tmp"/>
+ <delete file="${pom}.asc"/>
<delete file="${file}.asc"/>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
