Author: brianf
Date: Wed May 28 06:37:25 2008
New Revision: 660948
URL: http://svn.apache.org/viewvc?rev=660948&view=rev
Log:
put the 2.0.9 structure back in place so that the deployed binaries have the
correct apache-maven-2.0.x-bin name we need to distribute.
Added:
maven/components/branches/maven-2.0.x/apache-maven/
- copied from r660942,
maven/components/branches/maven-2.0.x/maven-distribution/
Removed:
maven/components/branches/maven-2.0.x/maven-distribution/
Modified:
maven/components/branches/maven-2.0.x/build.xml
maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml
maven/components/branches/maven-2.0.x/pom.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=660948&r1=660947&r2=660948&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/build.xml (original)
+++ maven/components/branches/maven-2.0.x/build.xml Wed May 28 06:37:25 2008
@@ -153,7 +153,7 @@
The new Maven distribution was created as part of the MAVEN-COMPILE step,
above.
This goal just validates the presence of that distribution.
</echo>
- <property name="maven.assembly"
location="maven-distribution/target/${maven.home.basename.expected}-bin.zip"/>
+ <property name="maven.assembly"
location="apache-maven/target/${maven.home.basename.expected}-bin.zip"/>
<condition property="build.failed">
<not>
<available file="${maven.assembly}"/>
Modified: maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml?rev=660948&r1=660947&r2=660948&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml
(original)
+++ maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml Wed May
28 06:37:25 2008
@@ -53,7 +53,7 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-distribution</artifactId>
+ <artifactId>apache-maven</artifactId>
<version>${project.version}</version>
<classifier>bin</classifier>
<type>tar.gz</type>
Modified: maven/components/branches/maven-2.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=660948&r1=660947&r2=660948&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/pom.xml Wed May 28 06:37:25 2008
@@ -225,7 +225,7 @@
<module>maven-script</module>
<module>maven-settings</module>
<module>maven-toolchain</module>
- <module>maven-distribution</module>
+ <module>apache-maven</module>
</modules>
<properties>