svn commit: r720610 - /maven/components/branches/maven-2.1.x/build.xml

[jd...@apache.org]

Author: jdcasey
Date: Tue Nov 25 13:42:10 2008
New Revision: 720610

URL: http://svn.apache.org/viewvc?rev=720610&view=rev
Log:
provide local repository access for the artifact:pom task, and make the script skip initialization of maven.repo.local if it's already defined.

Modified:
    maven/components/branches/maven-2.1.x/build.xml

Modified: maven/components/branches/maven-2.1.x/build.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/build.xml?rev=720610&r1=720609&r2=720610&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/build.xml (original)
+++ maven/components/branches/maven-2.1.x/build.xml Tue Nov 25 13:42:10 2008
@@ -43,6 +43,10 @@
     <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath"/>
     <property name="taskdefs.inited" value="true"/>
   </target>
+  
+  <target name="initLocalRepo" unless="maven.repo.local">
+    <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  </target>
 
   <target name="isMavenHomeSet" depends="initTaskDefs">
     <property environment="env"/>
@@ -52,22 +56,23 @@
     <fail unless="maven.home" message="You must set the M2_HOME environment variable or specify a maven.home property to this Ant script"/>
   </target>
   
-  <target name="read-pom" depends="initTaskDefs" unless="pom.version">
+  <target name="read-pom" depends="initTaskDefs,initLocalRepo" unless="pom.version">
     <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:pom file="${basedir}/dependencies.xml" id="pom">
+      <localRepository path="${maven.repo.local}"/>
+    </artifact:pom>
     <delete file="${basedir}/dependencies.xml"/>
   </target>
 
-  <target name="init" depends="isMavenHomeSet">
+  <target name="init" depends="isMavenHomeSet,initLocalRepo">
     <xmlproperty prefix="pom" file="pom.xml"/>    
     <basename file="${maven.home}" property="maven.home.basename"/>
     <dirname file="${maven.home}" property="maven.home.dirname"/>
     <!-- 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="surefire.useFile" value="true"/>    
     <echo>maven.home = ${maven.home}</echo>
     <echo>maven.assembly = ${maven.assembly}</echo>