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/10/30 22:04:51 UTC
svn commit: r709241 - in /maven/components/branches/maven-2.0.x: build.xml
maven-integration-tests/pom.xml
Author: jdcasey
Date: Thu Oct 30 14:04:51 2008
New Revision: 709241
URL: http://svn.apache.org/viewvc?rev=709241&view=rev
Log:
using a branch-based versioning scheme for IT working dirs to allow side-by-side builds of different branches.
Modified:
maven/components/branches/maven-2.0.x/build.xml
maven/components/branches/maven-2.0.x/maven-integration-tests/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=709241&r1=709240&r2=709241&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/build.xml (original)
+++ maven/components/branches/maven-2.0.x/build.xml Thu Oct 30 14:04:51 2008
@@ -18,6 +18,8 @@
-->
<project default="all" basedir="." xmlns:artifact="urn:maven-artifact-ant">
+
+ <property name="it.workdir.version" value="2.0.x"/>
<target name="initTaskDefs">
<xmlproperty file="pom.xml" prefix="pom.xml" />
@@ -207,7 +209,7 @@
<echo>Running integration tests</echo>
<!-- Hard-coding to /tmp/ to avoid long path names that will make windows scream. -->
- <exec failonerror="true" dir="/tmp/maven-integration-tests" executable="cmd">
+ <exec failonerror="true" dir="/tmp/maven-integration-tests-${it.workdir.version}" executable="cmd">
<arg value="/c"/>
<arg value="${maven.home}\bin\mvn.bat"/>
<arg value="-B"/>
@@ -226,7 +228,7 @@
<echo>Running integration tests</echo>
<!-- Hard-coding to /tmp/ to avoid long path names that will make windows scream. -->
- <exec failonerror="true" dir="/tmp/maven-integration-tests" executable="${maven.home}/bin/mvn">
+ <exec failonerror="true" dir="/tmp/maven-integration-tests-${it.workdir.version}" executable="${maven.home}/bin/mvn">
<arg value="-Prun-its"/>
<arg value="-B"/>
<arg value="clean"/>
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=709241&r1=709240&r2=709241&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 Thu Oct 30 14:04:51 2008
@@ -19,7 +19,8 @@
<activation>
<activeByDefault>true</activeByDefault>
<file>
- <exists>/tmp/maven-integration-tests/pom.xml</exists>
+ <!-- NOT INTERPOLATED. These values must be explicit. -->
+ <exists>/tmp/maven-integration-tests-2.0.x/pom.xml</exists>
</file>
</activation>
<build>
@@ -43,7 +44,8 @@
<id>checkout</id>
<activation>
<file>
- <missing>/tmp/maven-integration-tests/pom.xml</missing>
+ <!-- NOT INTERPOLATED. These values must be explicit. -->
+ <missing>/tmp/maven-integration-tests-2.0.x/pom.xml</missing>
</file>
</activation>
<build>
@@ -91,7 +93,8 @@
<connectionUrl>scm:svn:http://svn.apache.org/repos/asf/maven/core-integration-testing/${integrationTestSVNDir}</connectionUrl>
<!-- Hard-coding to /tmp/ to avoid long path names that will make windows scream. -->
- <checkoutDirectory>/tmp/maven-integration-tests</checkoutDirectory>
+ <!-- NOT INTERPOLATED DURING PROFILE ACTIVATION, so making these values explicit throughout to avoid confusion. -->
+ <checkoutDirectory>/tmp/maven-integration-tests-2.0.x</checkoutDirectory>
</configuration>
</plugin>
</plugins>