You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/08/03 22:35:53 UTC
svn commit: r982028 [2/2] - in /maven/core-integration-testing/trunk:
core-it-suite/ core-it-suite/src/test/java/org/apache/maven/it/
core-it-suite/src/test/resources-filtered/
core-it-suite/src/test/resources/bootstrap/
core-it-suite/src/test/resource...
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-5/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-5/pom.xml?rev=982028&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-5/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-5/pom.xml Tue Aug 3 20:35:51 2010
@@ -0,0 +1,62 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.bootstrap</groupId>
+ <artifactId>maven-it-boostrap</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>org.apache.maven.its.bootstrap</groupId>
+ <artifactId>group-5</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: Boostrap :: Group-5</name>
+
+ <properties>
+ <itPluginVersion>2.1-SNAPSHOT</itPluginVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-plexus-utils-11</artifactId>
+ <version>${itPluginVersion}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-plexus-utils-new</artifactId>
+ <version>${itPluginVersion}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>maven-core-it-support</artifactId>
+ <version>1.3</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-5/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-5/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml?rev=982028&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml Tue Aug 3 20:35:51 2010
@@ -0,0 +1,55 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.bootstrap</groupId>
+ <artifactId>maven-it-boostrap</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>org.apache.maven.its.bootstrap</groupId>
+ <artifactId>group-6</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: Boostrap :: Group-6</name>
+
+ <properties>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav-jackrabbit</artifactId>
+ <version>1.0-beta-3</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>maven-core-it-support</artifactId>
+ <version>1.4</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/pom.xml?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/pom.xml Tue Aug 3 20:35:51 2010
@@ -25,369 +25,30 @@ under the License.
<groupId>org.apache.maven.its.bootstrap</groupId>
<artifactId>maven-it-boostrap</artifactId>
<version>1.0</version>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<name>Maven Integration Test :: Boostrap</name>
<description>
- This project pulls down all the snapshot plugins required for the IT suite. Due to MNG-2974, snapshot versions of
+ This project pulls down all the artifacts/plugins required for the IT suite. Due to MNG-2974, snapshot versions of
plugins cannot be downloaded by Maven from non-default repositories configured in the POM if the plugin is invoked
directly from the command line. Also, having this in a central place spares us from copying the snapshot repo
config all around in the IT POMs.
</description>
+ <modules>
+ <!-- Dependencies are split into groups when conflict resolution would otherwise prevent downloads -->
+ <module>group-1</module>
+ <module>group-2</module>
+ <module>group-3</module>
+ <module>group-4</module>
+ <module>group-5</module>
+ <module>group-6</module>
+ </modules>
+
<properties>
- <itPluginVersion>2.1-SNAPSHOT</itPluginVersion>
- <stubPluginVersion>0.1-stub-SNAPSHOT</stubPluginVersion>
<maven.test.skip>true</maven.test.skip>
</properties>
- <dependencies>
- <!-- IT plugins/artifacts in alphabetical order -->
- <dependency>
- <groupId>org.apache.maven.its</groupId>
- <artifactId>core-it-extension</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its</groupId>
- <artifactId>core-it-wagon</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its</groupId>
- <artifactId>core-it-toolchain</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-active-collection</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-all</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-ant-based</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-artifact</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-class-loader</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-configuration</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-context-passing</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-dependency-collection</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-dependency-resolution</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-expression</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-error</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-extension-consumer</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-extension-provider</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-extension1</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-extension2</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-fork</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-invalid-descriptor</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-log4j</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-log-file</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-no-default-comp</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-no-project</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-online</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-optional-mojos</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-packaging</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-parameter-implementation</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-plexus-utils-11</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-plexus-utils-new</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-plexus-component-api</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-plugin-dependency</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-project-interpolation</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- <exclusions>
- <!--
- NOTE: This artifact (and its dependency maven-verifier) are in use by the class loader employed by Surefire
- to orchestrate this test. Re-downloading (newer snapshots of) these artifacts during the tests will wreck
- havoc on the class loader, i.e. tests fail due to NoClassDefFoundError's in the test controller.
- -->
- <exclusion>
- <groupId>org.apache.maven.its</groupId>
- <artifactId>maven-it-helper</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-setter</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-singleton-component</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-site</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-touch</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-toolchain</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-uses-properties</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-uses-wagon</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- stub plugins in alphabetical order -->
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>${stubPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${stubPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>${stubPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <version>${stubPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- <version>${stubPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>${stubPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>${stubPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${stubPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>${stubPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-rar-plugin</artifactId>
- <version>${stubPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>${stubPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>${stubPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>${stubPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${stubPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>${stubPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-
<build>
<!-- This merely locks the plugin versions to disable auto-update -->
<plugins>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3297/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3297/pom.xml?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3297/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3297/pom.xml Tue Aug 3 20:35:51 2010
@@ -34,7 +34,7 @@ under the License.
<dependencies>
<dependency>
- <groupId>org.apache.maven</groupId>
+ <groupId>org.apache.maven.its</groupId>
<artifactId>maven-core-it-support</artifactId>
<version>1.0</version>
<scope>compile</scope>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/settings-template.xml?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/settings-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/settings-template.xml Tue Aug 3 20:35:51 2010
@@ -63,7 +63,7 @@ under the License.
<mirrors>
<mirror>
- <id>central</id>
+ <id>test-a</id>
<url>@baseurl@/repo-3</url>
<!-- should not match anything but maven-core-it-ext -->
<mirrorOf>external:*</mirrorOf>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4355/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4355/pom.xml?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4355/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4355/pom.xml Tue Aug 3 20:35:51 2010
@@ -42,5 +42,11 @@ under the License.
<!-- NOTE: Intentionally no version here, Maven should automatically pick one -->
</extension>
</extensions>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>0.1-stub-SNAPSHOT</version>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: maven/core-integration-testing/trunk/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java (original)
+++ maven/core-integration-testing/trunk/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java Tue Aug 3 20:35:51 2010
@@ -379,46 +379,70 @@ public abstract class AbstractMavenInteg
return version;
}
- protected Verifier newVerifier( File basedir )
+ protected Verifier newVerifier( String basedir )
throws VerificationException
{
- return newVerifier( basedir.getAbsolutePath() );
+ return newVerifier( basedir, false );
}
- protected Verifier newVerifier( String basedir )
+ protected Verifier newVerifier( String basedir, String settings )
throws VerificationException
{
- return newVerifier( basedir, false );
+ return newVerifier( basedir, settings, false );
}
protected Verifier newVerifier( String basedir, boolean debug )
throws VerificationException
{
+ return newVerifier( basedir, "", debug );
+ }
+
+ protected Verifier newVerifier( String basedir, String settings, boolean debug )
+ throws VerificationException
+ {
Verifier verifier = new Verifier( basedir, debug );
verifier.setAutoclean( false );
- String globalSettings = System.getProperty( "maven.it.global-settings", "" );
- if ( globalSettings.length() > 0 )
+ if ( settings != null )
{
- globalSettings = new File( globalSettings ).getAbsolutePath();
+ File settingsFile;
+ if ( settings.length() > 0 )
+ {
+ settingsFile = new File( "settings-" + settings + ".xml" );
+ }
+ else
+ {
+ settingsFile = new File( "settings.xml" );
+ }
+
+ if ( !settingsFile.isAbsolute() )
+ {
+ String settingsDir = System.getProperty( "maven.it.global-settings.dir", "" );
+ if ( settingsDir.length() > 0 )
+ {
+ settingsFile = new File( settingsDir, settingsFile.getPath() );
+ }
+ }
+
+ String path = settingsFile.getAbsolutePath();
// dedicated CLI option only available since MNG-3914
if ( matchesVersionRange( "[2.1.0,)" ) )
{
verifier.getCliOptions().add( "--global-settings" );
- if ( globalSettings.indexOf( ' ' ) < 0 )
+ if ( path.indexOf( ' ' ) < 0 )
{
- verifier.getCliOptions().add( globalSettings );
+ verifier.getCliOptions().add( path );
}
else
{
- verifier.getCliOptions().add( '"' + globalSettings + '"' );
+ verifier.getCliOptions().add( '"' + path + '"' );
}
}
else
{
- verifier.getSystemProperties().put( "org.apache.maven.global-settings", globalSettings );
+ verifier.getSystemProperties().put( "org.apache.maven.global-settings", path );
}
}