o update the mercury and ant-task based builds

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@756798 13f79535-47bb-0310-9956-ffa450edef68

build-mercury.xml

@@ -63,7 +63,7 @@ END SNIPPET: ant-bootstrap -->
     <!-- Initialize properties -->
     <property name="maven.home.basename.expected" value="apache-maven-${pom.project.version}"/>
     <property name="maven.assembly" location="apache-maven/target/${maven.home.basename.expected}-bin.zip"/>
-  	<property name="maven.repo.local"   value="${user.home}/.m2/repository"/>
+    <property name="maven.repo.local"   value="${user.home}/.m2/repository"/>
     <property name="maven.repo.central" value="http://repository.sonatype.org/content/groups/public"/>
 <!--
     <property name="maven.repo.central" value="http://repo1.maven.org/maven2"/>
@@ -84,7 +84,7 @@ END SNIPPET: ant-bootstrap -->
 
   <target name="clean-local-repo" description="cleans up local repo" unless="do.not.clean.local.repo">
     <delete dir="${maven.repo.local}"/>
-  	<mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="${maven.repo.local}"/>
   </target>
 
   <target name="pull" depends="init,clean-local-repo" unless="skip.pull">
@@ -97,10 +97,10 @@ END SNIPPET: ant-bootstrap -->
     <mercury:local-repository location="${maven.repo.local}"/>
     <mercury:remote-repository id="central" location="${maven.repo.central}"/>
 
-  	<property name="tsFormat" value="HH:mm:ss"/>
-  	<tstamp><format property="start.time" pattern="${tsFormat}"/></tstamp>
+    <property name="tsFormat" value="HH:mm:ss"/>
+    <tstamp><format property="start.time" pattern="${tsFormat}"/></tstamp>
 
-  	<!-- classpaths with default names: mercury.classpath, mercury.classpath.test, mercury.classpath.runtime -->
+    <!-- classpaths with default names: mercury.classpath, mercury.classpath.test, mercury.classpath.runtime -->
     <mercury:resolve-dependencies scope="compile">
       <mercury:dependency source="maven:${basedir}/dependencies.xml"/>
       <mercury:dependency id="org.codehaus.plexus:plexus-component-metadata:${pom.properties.plexusVersion}"/>
@@ -108,7 +108,7 @@ END SNIPPET: ant-bootstrap -->
       <mercury:exclusions>
         <mercury:exclusion id="org.sonatype.mercury:mercury-mp3-cli"/>
         <mercury:exclusion id="org.sonatype.mercury:mercury-mp3-delta"/>
-      	<mercury:exclusion id="org.sonatype.mercury:mercury-mp3-api"/>
+        <mercury:exclusion id="org.sonatype.mercury:mercury-mp3-api"/>
       </mercury:exclusions>
 
     </mercury:resolve-dependencies>
@@ -124,7 +124,7 @@ END SNIPPET: ant-bootstrap -->
 <!--
 -->
 
-  	<delete file="${basedir}/dependencies.xml"/>
+    <delete file="${basedir}/dependencies.xml"/>
 
     <tstamp><format property="modello.start.time" pattern="${tsFormat}"/></tstamp>
 
@@ -133,7 +133,7 @@ END SNIPPET: ant-bootstrap -->
       <mercury:dependency id="org.codehaus.modello:modello-maven-plugin:${pom.properties.modelloVersion}"/>
     </mercury:resolve-dependencies>
 
-  	<tstamp><format property="modello.stop.time" pattern="${tsFormat}"/></tstamp>
+    <tstamp><format property="modello.stop.time" pattern="${tsFormat}"/></tstamp>
 
     <echo>=======================================</echo>
     <echo>Modello: start ${modello.start.time}, stop ${modello.stop.time}</echo>

build.xml

@@ -90,13 +90,6 @@ END SNIPPET: ant-bootstrap -->
     <!-- Pull the dependencies for Modello -->
     <artifact:dependencies pathId="modello.pathid" filesetId="modello.fileset" verbose="${verbose}">
       <localRepository path="${maven.repo.local}"/>
-      <!-- TODO: remove when Modello 1.0.1 is released -->
-      <remoteRepository url="http://repo1.maven.org/" id="central"/>
-      <remoteRepository url="http://snapshots.repository.codehaus.org/" id="codehaus.snapshots">
-        <snapshots enabled="true"/>
-        <releases enabled="false"/>
-      </remoteRepository>
-      <!-- /TODO -->
       <dependency groupId="org.codehaus.modello" artifactId="modello-maven-plugin" version="${pom.properties.modelloVersion}"/>
     </artifact:dependencies>
 
@@ -171,6 +164,7 @@ END SNIPPET: ant-bootstrap -->
     </macrodef>
 
     <modello file="maven-model/src/main/mdo/maven.mdo" version="4.0.0"/>
+    <modello file="maven-lifecycle/src/main/mdo/maven-lifecycle.mdo"/>
     <modello file="maven-plugin-api/src/main/mdo/lifecycle.mdo"/>
     <modello file="maven-project/src/main/mdo/profiles.mdo"/>
     <modello file="maven-core/src/main/mdo/settings.mdo"/>