svn commit: r1001483 - in /maven/components/branches/maven-2.0.x: build.xml maven-ant-tasks-2.0.8.jar maven-ant-tasks-2.1.1.jar

[be...@apache.org]

Author: bentmann
Date: Sun Sep 26 17:24:36 2010
New Revision: 1001483

URL: http://svn.apache.org/viewvc?rev=1001483&view=rev
Log:
o Fixed bootstrap to work with Ant 1.8.x

Added:
    maven/components/branches/maven-2.0.x/maven-ant-tasks-2.1.1.jar   (with props)
Removed:
    maven/components/branches/maven-2.0.x/maven-ant-tasks-2.0.8.jar
Modified:
    maven/components/branches/maven-2.0.x/build.xml

Modified: maven/components/branches/maven-2.0.x/build.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/build.xml?rev=1001483&r1=1001482&r2=1001483&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/build.xml (original)
+++ maven/components/branches/maven-2.0.x/build.xml Sun Sep 26 17:24:36 2010
@@ -20,8 +20,8 @@ under the License.
 <project default="all" basedir="." xmlns:artifact="urn:maven-artifact-ant">
   
   <target name="initTaskDefs" unless="taskdefs.inited">
-    <xmlproperty file="pom.xml" prefix="pom.xml" />
-    <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.0.8.jar"/>
+    <xmlproperty file="pom.xml" prefix="xmlPom" />
+    <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.1.1.jar"/>
     <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>
@@ -64,10 +64,9 @@ under the License.
   </target>
 
   <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"/>
-    <property name="maven.home.basename.expected" value="apache-maven-${pom.project.version}"/>
+    <property name="maven.home.basename.expected" value="apache-maven-${xmlPom.project.version}"/>
   </target>
 
   <target name="clean-bootstrap" description="cleans up generated bootstrap classes">
@@ -75,10 +74,9 @@ under the License.
   </target>
 
   <target name="pull" depends="init, read-poms" unless="skip.pull">
-    <property name="verbose" value="false"/>
     <property name="bootstrap.repository" value="${basedir}/bootstrap-repository"/>
     <!-- Pull the dependencies that Maven needs to build -->
-    <artifact:dependencies pathId="pom.pathid" filesetId="pom.fileset" verbose="${verbose}">
+    <artifact:dependencies pathId="pom.pathid" filesetId="pom.fileset">
        <!--
        <localRepository path="${bootstrap.repository}"/>
        -->
@@ -86,7 +84,7 @@ under the License.
     </artifact:dependencies>
     
     <!-- Pull the dependencies for Modello -->
-    <artifact:dependencies pathId="modello.pathid" filesetId="modello.fileset" verbose="${verbose}">
+    <artifact:dependencies pathId="modello.pathid" filesetId="modello.fileset">
        <!--
        <localRepository path="${bootstrap.repository}"/>
        -->
@@ -147,14 +145,14 @@ under the License.
     </path>
 
     <mkdir dir="bootstrap/target/classes"/>
-    <javac destdir="bootstrap/target/classes" encoding="UTF-8" source="1.4" target="1.4" debug="${debug}">
+    <javac destdir="bootstrap/target/classes" encoding="UTF-8" source="1.4" target="1.4" debug="${debug}" includeAntRuntime="false">
       <src refid="sources"/>
       <classpath refid="pom.pathid"/>
     </javac>
 
     <!-- DGF generating a fake pom.properties so Maven thinks it has a version number -->
     <mkdir dir="bootstrap/target/classes/META-INF/maven/org.apache.maven/maven-core"/>
-    <echo message="version=${pom.project.version}"
+    <echo message="version=${xmlPom.project.version}"
           file="bootstrap/target/classes/META-INF/maven/org.apache.maven/maven-core/pom.properties"/>
 
     <path id="maven.classpath">
@@ -171,6 +169,7 @@ under the License.
       <arg value="-e"/>
       <arg value="clean"/>
       <arg value="install"/>
+      <arg value="-Dmaven.repo.local=${maven.repo.local}"/>
     </java>
   </target>
 
@@ -294,8 +293,8 @@ under the License.
 
   <target name="with-its" depends="all,run-its"/>
   
-  <target name="set-temp-maven-home" depends="read-poms">
-    <property name="maven.home" location="${java.io.tmpdir}/apache-maven-${pom.version}"/>
+  <target name="set-temp-maven-home" depends="initTaskDefs">
+    <property name="maven.home" location="${java.io.tmpdir}/apache-maven-${xmlPom.project.version}"/>
     <echo>Using temporary maven install directory: ${maven.home}</echo>
   </target>
   

Added: maven/components/branches/maven-2.0.x/maven-ant-tasks-2.1.1.jar
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-ant-tasks-2.1.1.jar?rev=1001483&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/components/branches/maven-2.0.x/maven-ant-tasks-2.1.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream