Author: jvanzyl
Date: Thu Jul 28 17:11:26 2011
New Revision: 1151928
URL: http://svn.apache.org/viewvc?rev=1151928&view=rev
Log:
o slight fix for the bootstrap, we want to use the distributionId for the build
not the distributionName
Modified:
maven/maven-3/trunk/build.xml
Modified: maven/maven-3/trunk/build.xml
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/build.xml?rev=1151928&r1=1151927&r2=1151928&view=diff
==============================================================================
--- maven/maven-3/trunk/build.xml (original)
+++ maven/maven-3/trunk/build.xml Thu Jul 28 17:11:26 2011
@@ -32,7 +32,9 @@ END SNIPPET: ant-bootstrap -->
<project default="all" basedir="." xmlns:artifact="urn:maven-artifact-ant">
<property name="distributionDirectory" value="apache-maven"/>
- <property name="distributionName" value="apache-maven"/>
+ <property name="distributionId" value="apache-maven"/>
+ <property name="distributionShortName" value="Maven"/>
+ <property name="distributionName" value="Apache Maven"/>
<property name="it.workdir.version" value="3.0.x" />
<target name="initTaskDefs">
@@ -75,7 +77,7 @@ Do you want to continue?</input>
<target name="init" depends="isMavenHomeSet">
<!-- Initialize properties -->
- <property name="maven.home.basename.expected"
value="${distributionName}-${xmlPom.project.version}" />
+ <property name="maven.home.basename.expected"
value="${distributionId}-${xmlPom.project.version}" />
<property name="maven.assembly"
location="${distributionDirectory}/target/${maven.home.basename.expected}-bin.zip"
/>
<property name="maven.repo.local" value="${user.home}/.m2/repository" />
<property name="maven.debug" value="-e" />
@@ -258,6 +260,8 @@ Do you want to continue?</input>
<arg value="-Dmaven.repo.local=${maven.repo.local}" />
<arg value="-Dsurefire.useFile=${surefire.useFile}" />
<arg
value="-Dmaven.test.redirectTestOutputToFile=${maven.test.redirectTestOutputToFile}"
/>
+ <arg value="-DdistributionId=${distributionId}" />
+ <arg value="-DdistributionShortName=${distributionShortName}" />
<arg value="-DdistributionName=${distributionName}" />
</java>
</target>
