Author: markt Date: Fri Mar 31 14:13:21 2017 New Revision: 1789689 URL: http://svn.apache.org/viewvc?rev=1789689&view=rev Log: Revert accidental commit
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=1789689&r1=1789688&r2=1789689&view=diff ============================================================================== --- tomcat/trunk/res/maven/mvn-pub.xml (original) +++ tomcat/trunk/res/maven/mvn-pub.xml Fri Mar 31 14:13:21 2017 @@ -49,18 +49,35 @@ </copy> <!--sign the jar, the source and the pom --> - <antcall target="-sign" > - <param name="file.in" value="@{file}" /> - <param name="file.out" value="@{file}.asc" /> - </antcall> - <antcall target="-sign" > - <param name="file.in" value="@{src}" /> - <param name="file.out" value="@{src}.asc" /> - </antcall> - <antcall target="-sign" > - <param name="file.in" value="@{pom}.tmp" /> - <param name="file.out" value="@{pom}.asc" /> - </antcall> + <exec executable="${gpg.exec}" failonerror="true" + inputstring="${gpg.passphrase}"> + <arg value="--batch"/> + <arg value="--passphrase-fd"/> + <arg value="0"/> + <arg value="-a"/> + <arg value="-b"/> + <arg value="${file}"/> + </exec> + <exec executable="${gpg.exec}" failonerror="true" + inputstring="${gpg.passphrase}"> + <arg value="--batch"/> + <arg value="--passphrase-fd"/> + <arg value="0"/> + <arg value="-a"/> + <arg value="-b"/> + <arg value="${src}"/> + </exec> + <exec executable="${gpg.exec}" failonerror="true" + inputstring="${gpg.passphrase}"> + <arg value="--batch"/> + <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> <artifact:deploy file="${file}"> <pom file="${pom}.tmp"/> @@ -114,14 +131,26 @@ </copy> <!--sign the file and pom --> - <antcall target="-sign" > - <param name="file.in" value="@{file}" /> - <param name="file.out" value="@{file}.asc" /> - </antcall> - <antcall target="-sign" > - <param name="file.in" value="@{pom}.tmp" /> - <param name="file.out" value="@{pom}.asc" /> - </antcall> + <exec executable="${gpg.exec}" failonerror="true" + inputstring="${gpg.passphrase}"> + <arg value="--batch"/> + <arg value="--passphrase-fd"/> + <arg value="0"/> + <arg value="-a"/> + <arg value="-b"/> + <arg value="${file}"/> + </exec> + <exec executable="${gpg.exec}" failonerror="true" + inputstring="${gpg.passphrase}"> + <arg value="--batch"/> + <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> <artifact:deploy file="${file}"> <pom file="${pom}.tmp"/> @@ -169,18 +198,35 @@ </copy> <!--sign the zip, the tar.gz and the pom --> - <antcall target="-sign" > - <param name="file.in" value="@{file}" /> - <param name="file.out" value="@{file}.asc" /> - </antcall> - <antcall target="-sign" > - <param name="file.in" value="@{file}.tar.gz" /> - <param name="file.out" value="@{file}.tar.gz.asc" /> - </antcall> - <antcall target="-sign" > - <param name="file.in" value="@{pom}.tmp" /> - <param name="file.out" value="@{pom}.asc" /> - </antcall> + <exec executable="${gpg.exec}" failonerror="true" + inputstring="${gpg.passphrase}"> + <arg value="--batch"/> + <arg value="--passphrase-fd"/> + <arg value="0"/> + <arg value="-a"/> + <arg value="-b"/> + <arg value="${file}.zip"/> + </exec> + <exec executable="${gpg.exec}" failonerror="true" + inputstring="${gpg.passphrase}"> + <arg value="--batch"/> + <arg value="--passphrase-fd"/> + <arg value="0"/> + <arg value="-a"/> + <arg value="-b"/> + <arg value="${file}.tar.gz"/> + </exec> + <exec executable="${gpg.exec}" failonerror="true" + inputstring="${gpg.passphrase}"> + <arg value="--batch"/> + <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> <artifact:deploy file="${pom}"> <pom file="${pom}.tmp"/> @@ -216,7 +262,7 @@ </sequential> </macrodef> - <target name="generic-deploy" depends="init-maven,init-gpg-1,init-gpg-2,init-ldap"> + <target name="generic-deploy" depends="init-maven,init-gpg,init-ldap"> <!-- Standard jars in bin directory --> <!-- Skip bootstrap.jar - it is just a subset of catalina.jar --> <doMavenDeploy artifactId="tomcat-juli" @@ -353,11 +399,7 @@ </antcall> </target> - <target name="init-gpg-1"> - <available file="${gpg.exec}" property="gpg.exec.available"/> - </target> - - <target name="init-gpg-2" if="${gpg.exec.available}"> + <target name="init-gpg"> <input message="Enter GPG pass-phrase" addproperty="gpg.passphrase" > <handler type="secure"/> </input> @@ -370,19 +412,4 @@ </input> </target> - <target name="-sign" if="gpg.passphrase"> - <fail unless="file" /> - <exec executable="${gpg.exec}" failonerror="true" - inputstring="${gpg.passphrase}"> - <arg value="--batch"/> - <arg value="--passphrase-fd"/> - <arg value="0"/> - <arg value="-a"/> - <arg value="-b"/> - <arg value="-o"/> - <arg value="${file.out}"/> - <arg value="${file.in}"/> - </exec> - </target> - </project> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org