Author: fhanik
Date: Tue May 22 09:26:02 2007
New Revision: 540638
URL: http://svn.apache.org/viewvc?view=rev&rev=540638
Log:
Added in build package using Maven ANT tasks and that signs our JARs with GPG
as well.
Almost there
Added:
tomcat/trunk/res/maven/dbcp.pom
Modified:
tomcat/trunk/res/maven/mvn-pub.xml
tomcat/trunk/res/maven/mvn.properties.default
Added: tomcat/trunk/res/maven/dbcp.pom
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/dbcp.pom?view=auto&rev=540638
==============================================================================
--- tomcat/trunk/res/maven/dbcp.pom (added)
+++ tomcat/trunk/res/maven/dbcp.pom Tue May 22 09:26:02 2007
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>dbcp</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <description>Tomcat Database Connection Pooling package</description>
+</project>
Modified: tomcat/trunk/res/maven/mvn-pub.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?view=diff&rev=540638&r1=540637&r2=540638
==============================================================================
--- tomcat/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/trunk/res/maven/mvn-pub.xml Tue May 22 09:26:02 2007
@@ -34,14 +34,43 @@
-->
<property file="${basedir}/mvn.properties"/>
<property file="${basedir}/mvn.properties.default"/>
+ <property name="local.repo" value="${user.home}/.m2/repository"/>
+
+ <target name="init-maven">
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
uri="urn:maven-artifact-ant">
+ <classpath>
+ <pathelement location="${basedir}/maven-ant-tasks-attached-patch.jar"
/>
+ <pathelement location="${basedir}/maven-artifact-ant-2.0.4-dep.jar" />
+ </classpath>
+ </typedef>
+ <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-2"/>
+ </target>
- <target name="maven-deploy">
+ <target name="maven-deploy" depends="init-maven">
<!--replace the version in the pom-->
<copy file="${pom}" tofile="${pom}.tmp">
<filterset>
<filter token="MAVEN.DEPLOY.VERSION" value="${maven.deploy.version}"/>
</filterset>
</copy>
+
+ <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="${file}"/>
+ </exec>
+
+ <artifact:deploy file="${file}">
+ <pom file="${pom}.tmp"/>
+ <remoteRepository url="${maven.repo.url}" layout="default">
+ <authentication username="${maven.scp.username}"
privateKey="${maven.scp.privateKey}" passphrase="${maven.scp.passphrase}"/>
+ </remoteRepository>
+ <attach file="${file}.asc" type="jar.asc"/>
+ </artifact:deploy>
+
+ <!--
<exec executable="${maven.home}/bin/${maven.bin}" failonerror="true">
<env key="MAVEN_HOME" value="${maven.home}"/>
<arg value="deploy:deploy-file"/>
@@ -55,10 +84,11 @@
<arg value="-Durl=${maven.repo.url}"/>
<arg value="-DpomFile=${pom}.tmp"/>
</exec>
+ -->
<delete file="${pom}.tmp"/>
</target>
- <target name="generic-deploy">
+ <target name="generic-deploy" depends="init-maven">
<antcall target="maven-deploy"><!--Deploy annotations-->
<param name="file" value="${tomcat.lib.path}/annotations-api.jar"/>
<param name="groupId" value="org.apache.tomcat"/>
@@ -130,6 +160,12 @@
<param name="groupId" value="org.apache.tomcat"/>
<param name="artifactId" value="jasper"/>
<param name="pom" value="${tomcat.pom.path}/jasper.pom"/>
+ </antcall>
+ <antcall target="maven-deploy"><!--Deploy DBCP-->
+ <param name="file" value="${tomcat.lib.path}/tomcat-dbcp.jar"/>
+ <param name="groupId" value="org.apache.tomcat"/>
+ <param name="artifactId" value="dbcp"/>
+ <param name="pom" value="${tomcat.pom.path}/dbcp.pom"/>
</antcall>
<antcall target="maven-deploy"><!--Deploy Extras Juli-->
<param name="file" value="${tomcat.extras.path}/tomcat-juli.jar"/>
Modified: tomcat/trunk/res/maven/mvn.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?view=diff&rev=540638&r1=540637&r2=540638
==============================================================================
--- tomcat/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/trunk/res/maven/mvn.properties.default Tue May 22 09:26:02 2007
@@ -6,6 +6,12 @@
#
#Maven properties
+maven.scp.username=fhanik
+maven.scp.privateKey=${user.home}/.ssh/id_rsa.export
+maven.scp.passphrase=
+maven.gpg.exec=C:/software/GNU/GnuPG/gpg.exe
+maven.gpg.passphrase=*****
+
maven.home=/development/maven-2.0.4
#Define mvn for Unix systems and mvn.bat for Windows as ANT exec requires the
full name
@@ -19,7 +25,7 @@
#Maven release properties for Tomcat staging
maven.release.repo.url=scp://people.apache.org/www/tomcat.apache.org/dev/dist/m2-repository
maven.release.repo.repositoryId=tomcat-staging
-maven.release.deploy.version=6.T.T
+maven.release.deploy.version=6.T.X
#Maven release properties for the main ASF repo
maven.asf.release.repo.url=scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
