Author: jdcasey
Date: Mon Dec 15 16:13:11 2008
New Revision: 726885
URL: http://svn.apache.org/viewvc?rev=726885&view=rev
Log:
merging fix for bootstrap with ITs from revIds 726875:726881 on 2.0.10-RC
branch.
Modified:
maven/components/branches/maven-2.0.x/ (props changed)
maven/components/branches/maven-2.0.x/build.xml
maven/components/branches/maven-2.0.x/maven-integration-tests/pom.xml
Propchange: maven/components/branches/maven-2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 15 16:13:11 2008
@@ -1,4 +1,4 @@
-/maven/components/branches/maven-2.0.10-RC:720697,725329-725330,725342,725349,725359,725748
+/maven/components/branches/maven-2.0.10-RC:720697,725329-725330,725342,725349,725359,725748,726876-726881
/maven/components/branches/maven-2.0.x:533160,636838,645583,645642,647357,649903,657432,659677,662033,662251,669665,670358,673499,673905,674059,675074,675087,675096,675375,675380,680604,682055
/maven/components/branches/maven-2.1.x:720038
/maven/components/trunk:720001,721902
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=726885&r1=726884&r2=726885&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/build.xml (original)
+++ maven/components/branches/maven-2.0.x/build.xml Mon Dec 15 16:13:11 2008
@@ -276,7 +276,7 @@
<target name="with-its" depends="all,run-its"/>
<target name="set-temp-maven-home" depends="read-poms">
- <property name="maven.home"
value="${java.io.tmpdir}/apache-maven-${pom.version}"/>
+ <property name="maven.home"
value="${java.io.tmpdir}${file.separator}apache-maven-${pom.version}"/>
<echo>Using temporary maven install directory: ${maven.home}</echo>
</target>
Modified: maven/components/branches/maven-2.0.x/maven-integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-integration-tests/pom.xml?rev=726885&r1=726884&r2=726885&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-integration-tests/pom.xml
(original)
+++ maven/components/branches/maven-2.0.x/maven-integration-tests/pom.xml Mon
Dec 15 16:13:11 2008
@@ -34,6 +34,9 @@
<goals>
<goal>update</goal>
</goals>
+ <configuration>
+ <workingDirectory>${itDir}</workingDirectory>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -58,6 +61,9 @@
<goals>
<goal>checkout</goal>
</goals>
+ <configuration>
+ <checkoutDirectory>${itDir}</checkoutDirectory>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -76,14 +82,20 @@
<filtering>true</filtering>
</resource>
</resources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<artifactId>maven-scm-plugin</artifactId>
<version>1.1</version>
<configuration>
<connectionUrl>scm:svn:http://svn.apache.org/repos/asf/maven/core-integration-testing/${integrationTestSVNDir}</connectionUrl>
- <checkoutDirectory>${itDir}</checkoutDirectory>
- <workingDirectory>${itDir}</workingDirectory>
</configuration>
</plugin>
</plugins>
