You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/12/16 01:14:57 UTC
svn commit: r726887 - in /maven/components/branches/maven-2.1.x: ./
build.xml maven-integration-tests/pom.xml
Author: jdcasey
Date: Mon Dec 15 16:14:56 2008
New Revision: 726887
URL: http://svn.apache.org/viewvc?rev=726887&view=rev
Log:
merging fix for bootstrap with ITs from revIds 726885 on 2.0.x branch.
Modified:
maven/components/branches/maven-2.1.x/ (props changed)
maven/components/branches/maven-2.1.x/build.xml
maven/components/branches/maven-2.1.x/maven-integration-tests/pom.xml
Propchange: maven/components/branches/maven-2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 15 16:14:56 2008
@@ -1,5 +1,5 @@
-/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-688882,720697,725329-725330,725342,725349,725359
-/maven/components/branches/maven-2.0.x:679552-679867,709032,709208,709241,720042,725949,726244,726417,726541
+/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-688882,720697,725329-725330,725342,725349,725359,726876-726881
+/maven/components/branches/maven-2.0.x:679552-679867,709032,709208,709241,720042,725949,726244,726417,726541,726885
/maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990
/maven/components/trunk:720001,721902
Modified: maven/components/branches/maven-2.1.x/build.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/build.xml?rev=726887&r1=726886&r2=726887&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/build.xml (original)
+++ maven/components/branches/maven-2.1.x/build.xml Mon Dec 15 16:14:56 2008
@@ -284,7 +284,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.1.x/maven-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-integration-tests/pom.xml?rev=726887&r1=726886&r2=726887&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-integration-tests/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-integration-tests/pom.xml Mon Dec 15 16:14:56 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>