--- maven.orig/build.xml
+++ maven/build.xml
@@ -39,6 +39,7 @@
   <property name="maven-compile.jvmargs" value="-Xmx512m -Xms512m"/>
   <property name="maven-compile.fork" value="true"/>
   <property name="maven-compile.maxmemory" value="512m"/>
+  <property environment="env" />
 
   <target name="initTaskDefs">
     <echo>Building ${distributionName} ...</echo>
@@ -48,7 +49,6 @@
   </target>
 
   <target name="isMavenHomeSet" depends="initTaskDefs">
-    <property environment="env" />
     <condition property="maven.home" value="${env.M2_HOME}">
       <isset property="env.M2_HOME" />
     </condition>
@@ -100,7 +100,10 @@
     <delete dir="bootstrap" />
   </target>
 
-  <target name="pull" depends="init" unless="skip.pull">
+  <target name="pull" depends="pull-network,pull-cached">
+  </target>
+
+  <target name="pull-network" depends="init" unless="skip.pull">
     <!-- Pull the dependencies that Maven needs to build -->
     <copy file="pom.xml" tofile="dependencies.xml" />
     <replace file="${basedir}/dependencies.xml" token="&lt;!--bootstrap-start-comment--&gt;" value="&lt;!--" />
@@ -125,10 +128,14 @@
       <localRepository path="${maven.repo.local}" />
       <dependency groupId="org.codehaus.plexus" artifactId="plexus-component-metadata" version="${pom.properties.plexusVersion}" />
     </artifact:dependencies>
-
+  </target>
+  <target name="pull-cached" depends="init" if="skip.pull">
+    <path id="pom.pathid"><pathelement path="${env.CLASSPATH}"/></path>
+    <path id="modello.pathid"><pathelement path="${env.CLASSPATH}"/></path>
+    <path id="pmdg.pathid"><pathelement path="${env.CLASSPATH}"/></path>
   </target>
 
-  <target name="process-classes" depends="pull" description="generates plexus component metadata.">
+  <target name="process-classes" depends="compile-boot" description="generates plexus component metadata.">
     <mkdir dir="${basedir}/bootstrap/target" />
     <mkdir dir="${basedir}/bootstrap/target/classes" />