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:46:48 UTC
svn commit: r709254 - in /maven/components/trunk: build.xml maven-compat/
maven-integration-tests/ maven-integration-tests/pom.xml pom.xml
Author: jdcasey
Date: Thu Oct 30 14:46:48 2008
New Revision: 709254
URL: http://svn.apache.org/viewvc?rev=709254&view=rev
Log:
Merging revIds: 709032, 709208, 709241 from 2.0.x branch for ITs in the bootstrap.
Added:
maven/components/trunk/maven-integration-tests/ (props changed)
- copied from r709032, maven/components/branches/maven-2.0.x/maven-integration-tests/
maven/components/trunk/maven-integration-tests/pom.xml
- copied, changed from r709032, maven/components/branches/maven-2.0.x/maven-integration-tests/pom.xml
Modified:
maven/components/trunk/build.xml
maven/components/trunk/maven-compat/ (props changed)
maven/components/trunk/pom.xml
Modified: maven/components/trunk/build.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/build.xml?rev=709254&r1=709253&r2=709254&view=diff
==============================================================================
--- maven/components/trunk/build.xml (original)
+++ maven/components/trunk/build.xml Thu Oct 30 14:46:48 2008
@@ -34,6 +34,8 @@
-->
<project default="all" basedir="." xmlns:artifact="urn:maven-artifact-ant">
+
+ <property name="it.workdir.version" value="3.0.x"/>
<target name="initTaskDefs">
<xmlproperty file="pom.xml" prefix="pom.xml" />
@@ -196,7 +198,58 @@
</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>
+ <!-- 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="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/trunk/maven-compat/
('svn:mergeinfo' removed)
Propchange: maven/components/trunk/maven-integration-tests/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Oct 30 14:46:48 2008
@@ -0,0 +1 @@
+tests
Copied: maven/components/trunk/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/trunk/maven-integration-tests/pom.xml?p2=maven/components/trunk/maven-integration-tests/pom.xml&p1=maven/components/branches/maven-2.0.x/maven-integration-tests/pom.xml&r1=709032&r2=709254&rev=709254&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-integration-tests/pom.xml (original)
+++ maven/components/trunk/maven-integration-tests/pom.xml Thu Oct 30 14:46:48 2008
@@ -4,7 +4,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.0.11-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>maven-integration-tests</artifactId>
<name>Maven Integration-Test Importer</name>
@@ -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-3.0.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-3.0.x/pom.xml</missing>
</file>
</activation>
<build>
@@ -69,28 +71,13 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>echo</id>
- <phase>validate</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <available property="exists" file="tests/pom.xml"/>
- <echo>Checking for POM in test workdir: tests/pom.xml. Exists? ${exists}</echo></tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <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>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-3.0.x</checkoutDirectory>
</configuration>
</plugin>
</plugins>
Modified: maven/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=709254&r1=709253&r2=709254&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Thu Oct 30 14:46:48 2008
@@ -1,20 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to you under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under
- the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
- OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+--><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
@@ -565,4 +567,4 @@
</build>
</profile>
</profiles>
-</project>
+</project>
\ No newline at end of file