You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/09/26 20:08:46 UTC
svn commit: r1001487 - in /maven/maven-2/branches/maven-2.2.x: ./ build.xml
maven-ant-tasks-2.0.8.jar maven-ant-tasks-2.1.1.jar
Author: bentmann
Date: Sun Sep 26 18:08:45 2010
New Revision: 1001487
URL: http://svn.apache.org/viewvc?rev=1001487&view=rev
Log:
o Fixed bootstrap to work with Ant 1.8.x
Added:
maven/maven-2/branches/maven-2.2.x/maven-ant-tasks-2.1.1.jar
- copied unchanged from r1001483, maven/components/branches/maven-2.0.x/maven-ant-tasks-2.1.1.jar
Removed:
maven/maven-2/branches/maven-2.2.x/maven-ant-tasks-2.0.8.jar
Modified:
maven/maven-2/branches/maven-2.2.x/ (props changed)
maven/maven-2/branches/maven-2.2.x/build.xml
Propchange: maven/maven-2/branches/maven-2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 26 18:08:45 2010
@@ -1,6 +1,6 @@
/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-688882,708790-728809,728834
/maven/components/branches/maven-2.0.11-RC:791431-904379
-/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940,729060,729738,729785,730461,730631,734502,734803,736543,746381
+/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940,729060,729738,729785,730461,730631,734502,734803,736543,746381,1001483
/maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990,752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
/maven/components/branches/maven-2.1.x:751686,767628,767631,768817,768995,769010-769011
Modified: maven/maven-2/branches/maven-2.2.x/build.xml
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/build.xml?rev=1001487&r1=1001486&r2=1001487&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/build.xml (original)
+++ maven/maven-2/branches/maven-2.2.x/build.xml Sun Sep 26 18:08:45 2010
@@ -36,8 +36,8 @@ TODO:
<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>
@@ -80,11 +80,9 @@ TODO:
</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"/>
- <!-- Initialize properties -->
- <property name="maven.home.basename.expected" value="apache-maven-${pom.project.version}"/>
+ <property name="maven.home.basename.expected" value="apache-maven-${xmlPom.project.version}"/>
<property name="maven.assembly" location="apache-maven/target/${maven.home.basename.expected}-bin.zip"/>
<property name="surefire.useFile" value="true"/>
<echo>maven.home = ${maven.home}</echo>
@@ -103,15 +101,14 @@ TODO:
</target>
<target name="pull" depends="init, read-poms" unless="skip.pull">
- <property name="verbose" value="false"/>
<!-- Pull the dependencies that Maven needs to build -->
- <artifact:dependencies pathId="pom.pathid" filesetId="pom.fileset" verbose="${verbose}" useScope="compile">
+ <artifact:dependencies pathId="pom.pathid" filesetId="pom.fileset" useScope="compile">
<localRepository path="${maven.repo.local}"/>
<pom refid="pom"/>
</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="${maven.repo.local}"/>
<dependency groupId="org.codehaus.modello" artifactId="modello-maven-plugin" version="1.0"/>
<dependency groupId="org.codehaus.modello" artifactId="modello-core" version="1.0"/>
@@ -173,14 +170,14 @@ TODO:
</path>
<mkdir dir="bootstrap/target/classes"/>
- <javac destdir="bootstrap/target/classes" encoding="UTF-8" source="1.5" target="1.5" debug="true">
+ <javac destdir="bootstrap/target/classes" encoding="UTF-8" source="1.5" target="1.5" debug="true" 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">
@@ -324,8 +321,8 @@ TODO:
<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>