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.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"/>