mirror of https://github.com/apache/maven.git
Merging revIds: 709032, 709208, 709241 from 2.0.x branch for ITs in the bootstrap.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@709254 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey
parent
c6a9575ad1
commit
94bdfa2c7d
53
build.xml
53
build.xml
|
|
@ -34,6 +34,8 @@ TODO:
|
|||
-->
|
||||
|
||||
<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 @@ TODO:
|
|||
</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>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,85 @@
|
|||
<?xml version="1.0"?>
|
||||
<project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<artifactId>maven</artifactId>
|
||||
<groupId>org.apache.maven</groupId>
|
||||
<version>3.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>maven-integration-tests</artifactId>
|
||||
<name>Maven Integration-Test Importer</name>
|
||||
|
||||
<properties>
|
||||
<integrationTestSVNDir>trunk</integrationTestSVNDir>
|
||||
<itDir>${pom.basedir}/tests</itDir>
|
||||
</properties>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>update</id>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
<file>
|
||||
<!-- NOT INTERPOLATED. These values must be explicit. -->
|
||||
<exists>/tmp/maven-integration-tests-3.0.x/pom.xml</exists>
|
||||
</file>
|
||||
</activation>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-scm-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>scm</id>
|
||||
<phase>initialize</phase>
|
||||
<goals>
|
||||
<goal>update</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>checkout</id>
|
||||
<activation>
|
||||
<file>
|
||||
<!-- NOT INTERPOLATED. These values must be explicit. -->
|
||||
<missing>/tmp/maven-integration-tests-3.0.x/pom.xml</missing>
|
||||
</file>
|
||||
</activation>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-scm-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>scm</id>
|
||||
<phase>initialize</phase>
|
||||
<goals>
|
||||
<goal>checkout</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
<build>
|
||||
<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>
|
||||
<!-- 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>
|
||||
</build>
|
||||
</project>
|
||||
36
pom.xml
36
pom.xml
|
|
@ -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>
|
||||
Loading…
Reference in New Issue