You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/01/30 03:23:13 UTC
svn commit: r739144 - /maven/components/trunk/build-mercury.xml
Author: jvanzyl
Date: Fri Jan 30 02:23:13 2009
New Revision: 739144
URL: http://svn.apache.org/viewvc?rev=739144&view=rev
Log:
o updating mercury ant tasks and now working on getting the bootstrap using them in earnest
Modified:
maven/components/trunk/build-mercury.xml
Modified: maven/components/trunk/build-mercury.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/build-mercury.xml?rev=739144&r1=739143&r2=739144&view=diff
==============================================================================
--- maven/components/trunk/build-mercury.xml (original)
+++ maven/components/trunk/build-mercury.xml Fri Jan 30 02:23:13 2009
@@ -29,13 +29,13 @@
END SNIPPET: ant-bootstrap -->
-<project default="all" basedir="." xmlns:artifact="urn:mercury-ant-tasks">
+<project default="all" basedir="." xmlns:mercury="urn:mercury-ant-tasks">
<property name="it.workdir.version" value="3.0.x"/>
<target name="initTaskDefs">
<xmlproperty file="pom.xml" prefix="pom.xml" />
- <path id="maven-ant-tasks.classpath" path="mercury-ant-tasks-1.0-alpha-1-SNAPSHOT.jar"/>
+ <path id="mercury-ant-tasks.classpath" path="mercury-ant-tasks-1.0.0-alpha-4-SNAPSHOT.jar"/>
<typedef resource="org/apache/maven/mercury/ant/tasks/antlib.xml" uri="urn:mercury-ant-tasks" classpathref="mercury-ant-tasks.classpath"/>
</target>
@@ -78,9 +78,11 @@
<copy file="pom.xml" tofile="dependencies.xml"/>
<replace file="${basedir}/dependencies.xml" token="<!--start-->" value="<!--"/>
<replace file="${basedir}/dependencies.xml" token="<!--end-->" value="-->"/>
+
<mercury:resolve-dependencies source="maven:pom.xml" id="pom">
<mercury:local-repository location="${maven.repo.local}"/>
</mercury:resolve-dependencies>
+
<delete file="${basedir}/dependencies.xml"/>
<!-- Pull the dependencies for Modello -->
@@ -93,7 +95,7 @@
<mercury:resolve-dependencies id="pmdg">
<mercury:local-repository path="${maven.repo.local}"/>
<mercury:dependency groupId="org.codehaus.plexus" artifactId="plexus-component-metadata" version="${pom.properties.plexusVersion}"/>
- </artifact:dependencies>
+ </mercury:resolve-dependencies>
</target>
<target name="process-classes" depends="pull" description="generates plexus component metadata.">