svn commit: r675536 - /maven/components/trunk/build.xml

[jv...@apache.org]

Author: jvanzyl
Date: Thu Jul 10 05:07:01 2008
New Revision: 675536

URL: http://svn.apache.org/viewvc?rev=675536&view=rev
Log:
o merge from shane's branch to allow arbitrary use of integration repository

Modified:
    maven/components/trunk/build.xml

Modified: maven/components/trunk/build.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/build.xml?rev=675536&r1=675535&r2=675536&view=diff
==============================================================================
--- maven/components/trunk/build.xml (original)
+++ maven/components/trunk/build.xml Thu Jul 10 05:07:01 2008
@@ -46,25 +46,21 @@
 
   <target name="pull" depends="init" unless="skip.pull">    
     <property name="verbose" value="false"/>
-    <property name="bootstrap.repository" value="${basedir}/bootstrap-repository"/>
+    <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
     <!-- Pull the dependencies that Maven needs to build -->
     <copy file="pom.xml" tofile="dependencies.xml"/>
     <replace file="${basedir}/dependencies.xml" token="&lt;!--start--&gt;" value="&lt;!--"/>
     <replace file="${basedir}/dependencies.xml" token="&lt;!--end--&gt;" value="--&gt;"/>
     <artifact:pom file="${basedir}/dependencies.xml" id="pom"/>                                                                                                     
     <artifact:dependencies pathId="pom.pathid" filesetId="pom.fileset" verbose="${verbose}">
-       <!--
-       <localRepository path="${bootstrap.repository}"/>
-       -->
+       <localRepository path="${maven.repo.local}"/>
        <pom refid="pom"/>                                                                                                                                       
     </artifact:dependencies>      
     <delete file="${basedir}/dependencies.xml"/>
     
     <!-- Pull the dependencies for Modello -->
     <artifact:dependencies pathId="modello.pathid" filesetId="modello.fileset" verbose="${verbose}">
-       <!--
-       <localRepository path="${bootstrap.repository}"/>
-       -->
+       <localRepository path="${maven.repo.local}"/>
        <dependency groupId="org.codehaus.modello" artifactId="modello-maven-plugin" version="1.0-alpha-17"/>                                                                                                                                      
     </artifact:dependencies>          
   </target>
@@ -142,6 +138,7 @@
       <arg value="-B"/>
       <arg value="clean"/>
       <arg value="install"/>
+      <arg value="-Dmaven.repo.local=${maven.repo.local}"/>
     </java>
   </target>
 
@@ -175,7 +172,6 @@
     <chmod perm="+x">
       <fileset dir="${maven.home}/bin">
         <include name="mvn"/>
-        <include name="m2"/>
       </fileset>
     </chmod>
   </target>