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:09:39 UTC
svn commit: r709243 - in /maven/components/branches/maven-2.1.x: ./
build.xml maven-integration-tests/ maven-integration-tests/pom.xml pom.xml
Author: jdcasey
Date: Thu Oct 30 14:09:38 2008
New Revision: 709243
URL: http://svn.apache.org/viewvc?rev=709243&view=rev
Log:
Merging revIds: 709032, 709208, 709241 from 2.0.x branch.
Added:
maven/components/branches/maven-2.1.x/maven-integration-tests/ (props changed)
- copied from r709032, maven/components/branches/maven-2.0.x/maven-integration-tests/
maven/components/branches/maven-2.1.x/maven-integration-tests/pom.xml
- copied, changed from r709032, maven/components/branches/maven-2.0.x/maven-integration-tests/pom.xml
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/pom.xml
Propchange: maven/components/branches/maven-2.1.x/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Oct 30 14:09:38 2008
@@ -1,3 +1,4 @@
+bootstrap
release.properties
maven.log
target
Propchange: maven/components/branches/maven-2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 30 14:09:38 2008
@@ -1,4 +1,4 @@
/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-688882
-/maven/components/branches/maven-2.0.x:679552-679867
+/maven/components/branches/maven-2.0.x:679552-679867,709032,709208,709241
/maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990
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=709243&r1=709242&r2=709243&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/build.xml (original)
+++ maven/components/branches/maven-2.1.x/build.xml Thu Oct 30 14:09:38 2008
@@ -34,6 +34,8 @@
-->
<project default="all" basedir="." xmlns:artifact="urn:maven-artifact-ant">
+
+ <property name="it.workdir.version" value="2.1.x"/>
<target name="initTaskDefs">
<xmlproperty file="pom.xml" prefix="pom.xml" />
@@ -194,7 +196,57 @@
</fileset>
</chmod>
</target>
+
+ <target name="its-setup">
+ <condition property="its.win32">
+ <os family="windows"/>
+ </condition>
+ <condition property="its.unix">
+ <not>
+ <os family="windows"/>
+ </not>
+ </condition>
+ </target>
+
+ <target name="its-win32" if="its.win32">
+ <echo>Retrieving integration tests</echo>
+ <exec dir="${basedir}/maven-integration-tests" executable="cmd">
+ <arg value="/c"/>
+ <arg value="${maven.home}\bin\mvn.bat"/>
+ <arg value="initialize"/>
+ </exec>
+
+ <echo>Running integration tests</echo>
+ <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="-Prun-its"/>
+ <arg value="clean"/>
+ <arg value="install"/>
+ </exec>
+ </target>
+ <target name="its-unix" if="its.unix">
+ <echo>Retrieving integration tests</echo>
+ <exec dir="${basedir}/maven-integration-tests" executable="${maven.home}/bin/mvn">
+ <arg value="initialize"/>
+ </exec>
+
+ <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-${it.workdir.version}" executable="${maven.home}/bin/mvn">
+ <arg value="-Prun-its"/>
+ <arg value="clean"/>
+ <arg value="install"/>
+ </exec>
+ </target>
+
+ <target name="run-its" depends="init,its-setup,its-win32,its-unix">
+ <echo>Integration-test results should be displayed above.</echo>
+ </target>
+
<target name="all" depends="clean-bootstrap,init,extract-assembly"/>
+ <target name="with-its" depends="all,run-its"/>
+
</project>
Propchange: maven/components/branches/maven-2.1.x/maven-integration-tests/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Oct 30 14:09:38 2008
@@ -0,0 +1 @@
+tests
Copied: maven/components/branches/maven-2.1.x/maven-integration-tests/pom.xml (from r709032, maven/components/branches/maven-2.0.x/maven-integration-tests/pom.xml)
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-integration-tests/pom.xml?p2=maven/components/branches/maven-2.1.x/maven-integration-tests/pom.xml&p1=maven/components/branches/maven-2.0.x/maven-integration-tests/pom.xml&r1=709032&r2=709243&rev=709243&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-integration-tests/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-integration-tests/pom.xml Thu Oct 30 14:09:38 2008
@@ -20,7 +20,8 @@
<activation>
<activeByDefault>true</activeByDefault>
<file>
- <exists>tests/pom.xml</exists>
+ <!-- NOT INTERPOLATED. These values must be explicit. -->
+ <exists>/tmp/maven-integration-tests-2.1.x/pom.xml</exists>
</file>
</activation>
<build>
@@ -44,7 +45,8 @@
<id>checkout</id>
<activation>
<file>
- <missing>tests/pom.xml</missing>
+ <!-- NOT INTERPOLATED. These values must be explicit. -->
+ <missing>/tmp/maven-integration-tests-2.1.x/pom.xml</missing>
</file>
</activation>
<build>
@@ -90,7 +92,9 @@
<version>1.1</version>
<configuration>
<connectionUrl>scm:svn:http://svn.apache.org/repos/asf/maven/core-integration-testing/${integrationTestSVNDir}</connectionUrl>
- <checkoutDirectory>tests</checkoutDirectory>
+ <!-- Hard-coding to /tmp/ to avoid long path names that will make windows scream. -->
+ <!-- NOT INTERPOLATED DURING PROFILE ACTIVATION, so making these values explicit throughout to avoid confusion. -->
+ <checkoutDirectory>/tmp/maven-integration-tests-2.1.x</checkoutDirectory>
</configuration>
</plugin>
</plugins>
Modified: maven/components/branches/maven-2.1.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/pom.xml?rev=709243&r1=709242&r2=709243&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/pom.xml Thu Oct 30 14:09:38 2008
@@ -560,4 +560,4 @@
</reporting>
</profile>
</profiles>
-</project>
+</project>
\ No newline at end of file