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 [1/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...
Author: bentmann
Date: Tue Aug 3 20:35:51 2010
New Revision: 982028
URL: http://svn.apache.org/viewvc?rev=982028&view=rev
Log:
o Enabled ITs to choose different global settings depending on network needs
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources-filtered/settings-remote.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-1/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-2/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-2/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-3/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-3/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-4/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-4/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-5/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-5/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-6/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml (with props)
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/settings.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMngtInheritanceTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1999DefaultReportsInheritanceTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleDashPCommandLineTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3530DynamicPOMInterpolationTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3704LifecycleExecutorWrapperTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3743ForkWithPluginManagementTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources-filtered/settings.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3297/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/settings-template.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4355/pom.xml
maven/core-integration-testing/trunk/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
Modified: maven/core-integration-testing/trunk/core-it-suite/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/pom.xml?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/pom.xml Tue Aug 3 20:35:51 2010
@@ -53,7 +53,8 @@ under the License.
Maven dependencies are added to the test class path.
If you're behind a proxy, use the system properties proxy.host, proxy.port, proxy.user and proxy.pass to specify the
- required proxy setup for the ITs.
+ required proxy setup for the ITs. Alternatively, set the system property maven.it.central to a URL of a local
+ repository manager that proxies the required artifacts.
-->
<scm>
@@ -69,6 +70,7 @@ under the License.
<!-- The (possibly instrumented copy of the) Maven distribution we actually use for the tests. -->
<preparedMavenHome>${mavenHome}</preparedMavenHome>
<!-- default properties used to filter the global settings -->
+ <maven.it.central>http://repository.sonatype.org/content/repositories/public</maven.it.central>
<proxy.active>false</proxy.active>
<proxy.host>localhost</proxy.host>
<proxy.port>80</proxy.port>
@@ -150,8 +152,8 @@ under the License.
<value>${preparedMavenHome}</value>
</property>
<property>
- <name>maven.it.global-settings</name>
- <value>${project.build.testOutputDirectory}/settings.xml</value>
+ <name>maven.it.global-settings.dir</name>
+ <value>${project.build.testOutputDirectory}</value>
</property>
</systemProperties>
</configuration>
@@ -233,7 +235,6 @@ under the License.
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <skip>false</skip>
<forkMode>once</forkMode>
<argLine>${surefireMemory}</argLine>
<systemProperties combine.children="append">
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMngtInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMngtInheritanceTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMngtInheritanceTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMngtInheritanceTest.java Tue Aug 3 20:35:51 2010
@@ -40,7 +40,7 @@ public class MavenIT0030DepPomDepMngtInh
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0030" );
- Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.deleteArtifact( "org.apache.maven.it", "maven-it-it0030", "1.0-SNAPSHOT", "jar" );
verifier.deleteArtifact( "org.apache.maven.it", "maven-it-it0030-child-hierarchy", "1.0-SNAPSHOT", "jar" );
verifier.deleteArtifact( "org.apache.maven.it", "maven-it-it0030-child-project1", "1.0-SNAPSHOT", "jar" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java Tue Aug 3 20:35:51 2010
@@ -45,10 +45,8 @@ public class MavenITBootstrapTest
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/bootstrap" );
- Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.setAutoclean( false );
- verifier.getCliOptions().add( "--settings" );
- verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "test-compile" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java Tue Aug 3 20:35:51 2010
@@ -87,7 +87,7 @@ public class MavenITmng0469ReportConfigT
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0469/test2" );
- Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
if ( matchesVersionRange( "(,3.0-alpha-1)" ) )
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1999DefaultReportsInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1999DefaultReportsInheritanceTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1999DefaultReportsInheritanceTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1999DefaultReportsInheritanceTest.java Tue Aug 3 20:35:51 2010
@@ -69,7 +69,7 @@ public class MavenITmng1999DefaultReport
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1999" );
- Verifier verifier = newVerifier( new File( testDir, "child2" ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( testDir, "child2" ).getAbsolutePath(), "remote" );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
verifier.executeGoal( "validate" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java Tue Aug 3 20:35:51 2010
@@ -46,7 +46,7 @@ public class MavenITmng2135PluginBuildIn
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2135" );
- Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.setAutoclean( false );
verifier.deleteDirectory( "plugin/target" );
verifier.deleteDirectory( "project/target" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java Tue Aug 3 20:35:51 2010
@@ -44,7 +44,7 @@ public class MavenITmng3221InfiniteForki
try
{
- verifier = newVerifier( reportDir.getAbsolutePath() );
+ verifier = newVerifier( reportDir.getAbsolutePath(), "remote" );
verifier.deleteArtifact( "org.apache.maven.its.mng3221", "maven-forking-report-plugin", "1", "jar" );
@@ -53,7 +53,7 @@ public class MavenITmng3221InfiniteForki
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = newVerifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.getCliOptions().add( "-Psite" );
@@ -82,7 +82,7 @@ public class MavenITmng3221InfiniteForki
try
{
- verifier = newVerifier( pluginDir.getAbsolutePath() );
+ verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.deleteArtifact( "org.apache.maven.its.mng3221", "maven-forking-test-plugin", "1", "jar" );
@@ -91,7 +91,7 @@ public class MavenITmng3221InfiniteForki
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = newVerifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.getCliOptions().add( "-Pplugin" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java Tue Aug 3 20:35:51 2010
@@ -49,7 +49,7 @@ public class MavenITmng3259DepsDroppedIn
Verifier verifier;
- verifier = newVerifier( new File( testDir, "parent" ).getAbsolutePath() );
+ verifier = newVerifier( new File( testDir, "parent" ).getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
@@ -57,7 +57,7 @@ public class MavenITmng3259DepsDroppedIn
verifier.resetStreams();
- verifier = newVerifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleDashPCommandLineTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleDashPCommandLineTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleDashPCommandLineTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleDashPCommandLineTest.java Tue Aug 3 20:35:51 2010
@@ -40,7 +40,7 @@ public class MavenITmng3268MultipleDashP
Verifier verifier;
- verifier = newVerifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.getCliOptions().add( "-Pprofile1,profile2" );
verifier.getCliOptions().add( "-Pprofile3" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java Tue Aug 3 20:35:51 2010
@@ -57,7 +57,7 @@ public class MavenITmng3372DirectInvocat
File project = new File( testBaseDir, "project" );
File settingsFile = new File( testBaseDir, "settings.xml" );
- Verifier verifier = newVerifier( plugin.getAbsolutePath() );
+ Verifier verifier = newVerifier( plugin.getAbsolutePath(), "remote" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3372" );
@@ -84,7 +84,7 @@ public class MavenITmng3372DirectInvocat
// file.
File testBaseDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3372/dependency-tree" );
- Verifier verifier = newVerifier( testBaseDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testBaseDir.getAbsolutePath(), "remote" );
verifier.getCliOptions().add( "-U" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java Tue Aug 3 20:35:51 2010
@@ -40,7 +40,7 @@ public class MavenITmng3396DependencyMan
String baseDir = "/mng-3396";
File testDir = ResourceExtractor.simpleExtractResources( getClass(), baseDir + "/dependencies" );
- Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.deleteArtifact( GROUP_ID, "A", "1.0", "pom" );
verifier.deleteArtifact( GROUP_ID, "A", "1.0", "jar" );
verifier.deleteArtifact( GROUP_ID, "B", "1.0", "pom" );
@@ -51,7 +51,7 @@ public class MavenITmng3396DependencyMan
testDir = ResourceExtractor.simpleExtractResources( getClass(), baseDir + "/plugin" );
- verifier = newVerifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.deleteArtifact( GROUP_ID, "A", "1.0", "pom" );
verifier.deleteArtifact( GROUP_ID, "A", "1.0", "jar" );
verifier.deleteArtifact( GROUP_ID, "A", "3.0", "pom" );
@@ -64,7 +64,7 @@ public class MavenITmng3396DependencyMan
testDir = ResourceExtractor.simpleExtractResources( getClass(), baseDir + "/pluginuser" );
- verifier = newVerifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.deleteArtifact( GROUP_ID, "pluginuser", "1.0", "pom" );
verifier.deleteArtifact( GROUP_ID, "pluginuser", "1.0", "jar" );
verifier.executeGoal( "install" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java Tue Aug 3 20:35:51 2010
@@ -42,7 +42,7 @@ public class MavenITmng3428PluginDescrip
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3428" );
- Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
// First, build the plugin we'll use to test the PluginDescriptor artifact collection.
verifier.executeGoal( "install" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java Tue Aug 3 20:35:51 2010
@@ -50,7 +50,7 @@ public class MavenITmng3441MetadataUpdat
Verifier verifier;
- verifier = newVerifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.getCliOptions().add( "-s" );
verifier.getCliOptions().add( "settings.xml" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java Tue Aug 3 20:35:51 2010
@@ -39,7 +39,7 @@ public class MavenITmng3485OverrideWagon
Verifier verifier;
- verifier = newVerifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "deploy" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java Tue Aug 3 20:35:51 2010
@@ -51,7 +51,7 @@ public class MavenITmng3498ForkToOtherMo
File pluginDir = new File( testDir, "maven-mng3498-plugin" );
File projectDir = new File( testDir, "mng-3498-project" );
- Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.deleteArtifact( "org.apache.maven.its.mng3498", "maven-mng3498-plugin", "1", "pom" );
verifier.executeGoal( "install" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java Tue Aug 3 20:35:51 2010
@@ -51,7 +51,7 @@ public class MavenITmng3506ArtifactHandl
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/" + AID );
- Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.deleteArtifacts( GID );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3530DynamicPOMInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3530DynamicPOMInterpolationTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3530DynamicPOMInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3530DynamicPOMInterpolationTest.java Tue Aug 3 20:35:51 2010
@@ -54,7 +54,7 @@ public class MavenITmng3530DynamicPOMInt
// validates that the modification propagated into the validation-mojo
// configuration. Once this is installed, we can run a project build that
// uses it to see how Maven will respond to a modification in the project build directory.
- Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
@@ -62,7 +62,7 @@ public class MavenITmng3530DynamicPOMInt
// Now, build the project. If the plugin configuration doesn't recognize
// the update to the project.build.directory, it will fail the build.
- verifier = newVerifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
@@ -81,7 +81,7 @@ public class MavenITmng3530DynamicPOMInt
// validates that the modification propagated into the validation-mojo
// configuration. Once this is installed, we can run a project build that
// uses it to see how Maven will respond to a modification in the POM property.
- Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
@@ -89,7 +89,7 @@ public class MavenITmng3530DynamicPOMInt
// Now, build the project. If the plugin configuration doesn't recognize
// the update to the myDirectory, it will fail the build.
- verifier = newVerifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
@@ -106,7 +106,7 @@ public class MavenITmng3530DynamicPOMInt
// First, install the plugin which validates that all resource directory
// specifications have been interpolated.
- Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
@@ -114,7 +114,7 @@ public class MavenITmng3530DynamicPOMInt
// Now, build the project. If the plugin finds an uninterpolated resource
// directory, it will fail the build.
- verifier = newVerifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java Tue Aug 3 20:35:51 2010
@@ -39,7 +39,7 @@ public class MavenITmng3536AppendedAbsol
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-3536" );
File pluginDir = new File( testDir, "plugin" );
- Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java Tue Aug 3 20:35:51 2010
@@ -41,7 +41,7 @@ public class MavenITmng3600DeploymentMod
Verifier verifier;
- verifier = newVerifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.setLogFileName( "log-no-settings.txt" );
verifier.executeGoal( "deploy" );
@@ -63,7 +63,7 @@ public class MavenITmng3600DeploymentMod
Verifier verifier;
- verifier = newVerifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings-server-defaults.xml" );
@@ -87,7 +87,7 @@ public class MavenITmng3600DeploymentMod
Verifier verifier;
- verifier = newVerifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings-modes-set.xml" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java Tue Aug 3 20:35:51 2010
@@ -101,12 +101,12 @@ public class MavenITmng3652UserAgentHead
File pluginDir = new File( testDir, "test-plugin" );
File projectDir = new File( testDir, "test-project" );
- Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = newVerifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.getCliOptions().add( "-DtestPort=" + port );
verifier.getCliOptions().add( "-X" );
@@ -145,12 +145,12 @@ public class MavenITmng3652UserAgentHead
File pluginDir = new File( testDir, "test-plugin" );
File projectDir = new File( testDir, "test-project" );
- Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = newVerifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
// test webdav
verifier.getCliOptions().add( "-DtestPort=" + port );
@@ -191,12 +191,12 @@ public class MavenITmng3652UserAgentHead
File pluginDir = new File( testDir, "test-plugin" );
File projectDir = new File( testDir, "test-project" );
- Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = newVerifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
// test settings with no config
@@ -239,12 +239,12 @@ public class MavenITmng3652UserAgentHead
File pluginDir = new File( testDir, "test-plugin" );
File projectDir = new File( testDir, "test-project" );
- Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = newVerifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
// test settings with config
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java Tue Aug 3 20:35:51 2010
@@ -45,13 +45,13 @@ public class MavenITmng3684BuildPluginPa
File pluginDir = new File( testDir, "maven-mng3684-plugin" );
File projectDir = new File( testDir, "project" );
- Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = newVerifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.setLogFileName( "log-validate.txt" );
verifier.executeGoal( "validate" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java Tue Aug 3 20:35:51 2010
@@ -49,7 +49,7 @@ public class MavenITmng3693PomFileBasedi
File pluginDir = new File( testDir, "maven-mng3693-plugin" );
File projectsDir = new File( testDir, "projects" );
- Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java Tue Aug 3 20:35:51 2010
@@ -46,7 +46,7 @@ public class MavenITmng3694ReactorProjec
File pluginDir = new File( testDir, "maven-mng3694-plugin" );
File projectDir = new File( testDir, "projects" );
- Verifier verifier = newVerifier( pluginDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java Tue Aug 3 20:35:51 2010
@@ -48,7 +48,7 @@ public class MavenITmng3703ExecutionProj
Verifier verifier;
- verifier = newVerifier( pluginDir.getAbsolutePath() );
+ verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
@@ -73,7 +73,7 @@ public class MavenITmng3703ExecutionProj
Verifier verifier;
- verifier = newVerifier( pluginDir.getAbsolutePath() );
+ verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3704LifecycleExecutorWrapperTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3704LifecycleExecutorWrapperTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3704LifecycleExecutorWrapperTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3704LifecycleExecutorWrapperTest.java Tue Aug 3 20:35:51 2010
@@ -49,14 +49,14 @@ public class MavenITmng3704LifecycleExec
File projectDir = new File( testDir, "project" );
Verifier verifier;
- verifier = newVerifier( pluginDir.getAbsolutePath() );
+ verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = newVerifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "package" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java Tue Aug 3 20:35:51 2010
@@ -51,7 +51,7 @@ public class MavenITmng3710PollutedClone
Verifier verifier;
- verifier = newVerifier( pluginDir.getAbsolutePath() );
+ verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
@@ -84,7 +84,7 @@ public class MavenITmng3710PollutedClone
Verifier verifier;
- verifier = newVerifier( pluginsDir.getAbsolutePath() );
+ verifier = newVerifier( pluginsDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java Tue Aug 3 20:35:51 2010
@@ -50,7 +50,7 @@ public class MavenITmng3716AggregatorFor
Verifier verifier;
- verifier = newVerifier( pluginDir.getAbsolutePath() );
+ verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java Tue Aug 3 20:35:51 2010
@@ -55,7 +55,7 @@ public class MavenITmng3723ConcreteParen
Verifier verifier;
- verifier = newVerifier( pluginDir.getAbsolutePath() );
+ verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java Tue Aug 3 20:35:51 2010
@@ -50,7 +50,7 @@ public class MavenITmng3724ExecutionProj
Verifier verifier;
- verifier = newVerifier( pluginDir.getAbsolutePath() );
+ verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java Tue Aug 3 20:35:51 2010
@@ -64,7 +64,7 @@ public class MavenITmng3729MultiForkAggr
Verifier verifier;
- verifier = newVerifier( pluginDir.getAbsolutePath() );
+ verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java Tue Aug 3 20:35:51 2010
@@ -52,7 +52,7 @@ public class MavenITmng3740SelfReferenti
Verifier verifier;
- verifier = newVerifier( v1.getAbsolutePath() );
+ verifier = newVerifier( v1.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3743ForkWithPluginManagementTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3743ForkWithPluginManagementTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3743ForkWithPluginManagementTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3743ForkWithPluginManagementTest.java Tue Aug 3 20:35:51 2010
@@ -48,13 +48,13 @@ public class MavenITmng3743ForkWithPlugi
File pluginsDir = new File( testDir, "plugins" );
File projectDir = new File( testDir, "project" );
- Verifier verifier = newVerifier( pluginsDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginsDir.getAbsolutePath(), "remote" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3743" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = newVerifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "site" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java Tue Aug 3 20:35:51 2010
@@ -50,7 +50,7 @@ public class MavenITmng3746POMPropertyOv
Verifier verifier;
- verifier = newVerifier( pluginDir.getAbsolutePath() );
+ verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -72,7 +72,7 @@ public class MavenITmng3746POMPropertyOv
Verifier verifier;
- verifier = newVerifier( pluginDir.getAbsolutePath() );
+ verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java Tue Aug 3 20:35:51 2010
@@ -46,7 +46,7 @@ public class MavenITmng4207PluginWithLog
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4207" );
- Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.setAutoclean( false );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java Tue Aug 3 20:35:51 2010
@@ -50,7 +50,7 @@ public class MavenITmng4238ArtifactHandl
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4238" );
- Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.deleteArtifacts( GID );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java Tue Aug 3 20:35:51 2010
@@ -52,7 +52,7 @@ public class MavenITmng4270ArtifactHandl
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/" + AID );
- Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.deleteArtifacts( GID );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java Tue Aug 3 20:35:51 2010
@@ -44,7 +44,7 @@ public class MavenITmng4633DualCompilerE
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4633" );
- Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.setAutoclean( false );
verifier.getCliOptions().add( "-T" );
verifier.getCliOptions().add( "2W" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java Tue Aug 3 20:35:51 2010
@@ -47,7 +47,7 @@ public class MavenITmng4654ArtifactHandl
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4654" );
- Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4654" );
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources-filtered/settings-remote.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources-filtered/settings-remote.xml?rev=982028&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources-filtered/settings-remote.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources-filtered/settings-remote.xml Tue Aug 3 20:35:51 2010
@@ -0,0 +1,74 @@
+<?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.
+-->
+
+<!--
+These settings are meant for ITs that download artifacts from remote servers. In general, ITs should use stub
+plugins/artifacts from test repos so use of these settings should be the exceptional case, not the default.
+-->
+
+<settings>
+ <proxies>
+ <proxy>
+ <id>it-proxy</id>
+ <active>${proxy.active}</active>
+ <protocol>${proxy.type}</protocol>
+ <host>${proxy.host}</host>
+ <port>${proxy.port}</port>
+ <username>${proxy.user}</username>
+ <password>${proxy.pass}</password>
+ <nonProxyHosts>localhost</nonProxyHosts>
+ </proxy>
+ </proxies>
+ <profiles>
+ <profile>
+ <id>it-defaults</id>
+ <repositories>
+ <repository>
+ <id>central</id>
+ <name>Apache Maven Integration Testing Repository</name>
+ <url>${maven.it.central}</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>central</id>
+ <name>Apache Maven Integration Testing Repository</name>
+ <url>${maven.it.central}</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+ <activeProfiles>
+ <activeProfile>it-defaults</activeProfile>
+ </activeProfiles>
+</settings>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources-filtered/settings-remote.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources-filtered/settings-remote.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources-filtered/settings.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources-filtered/settings.xml?rev=982028&r1=982027&r2=982028&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources-filtered/settings.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources-filtered/settings.xml Tue Aug 3 20:35:51 2010
@@ -19,19 +19,13 @@ specific language governing permissions
under the License.
-->
+<!--
+These settings are meant for ITs that don't download artifacts from remote servers, i.e. ITs that either use their
+own test repos or can employ the local repository (after bootstrapping). This configuration uses a file: URL to
+"central" to avoid needless network access for files knowingly not present externally.
+-->
+
<settings>
- <proxies>
- <proxy>
- <id>it-proxy</id>
- <active>${proxy.active}</active>
- <protocol>${proxy.type}</protocol>
- <host>${proxy.host}</host>
- <port>${proxy.port}</port>
- <username>${proxy.user}</username>
- <password>${proxy.pass}</password>
- <nonProxyHosts>localhost</nonProxyHosts>
- </proxy>
- </proxies>
<profiles>
<profile>
<id>it-defaults</id>
@@ -39,7 +33,7 @@ under the License.
<repository>
<id>central</id>
<name>Apache Maven Integration Testing Repository</name>
- <url>http://repo1.maven.org/maven2</url>
+ <url>file:target/null</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -52,7 +46,7 @@ under the License.
<pluginRepository>
<id>central</id>
<name>Apache Maven Integration Testing Repository</name>
- <url>http://repo1.maven.org/maven2</url>
+ <url>file:target/null</url>
<releases>
<enabled>true</enabled>
</releases>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-1/pom.xml?rev=982028&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-1/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-1/pom.xml Tue Aug 3 20:35:51 2010
@@ -0,0 +1,141 @@
+<?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-1</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: Boostrap :: Group-1</name>
+
+ <properties>
+ <stubPluginVersion>0.1-stub-SNAPSHOT</stubPluginVersion>
+ </properties>
+
+ <dependencies>
+ <!-- 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>
+ <dependency>
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>maven-core-it-support</artifactId>
+ <version>1.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-2/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-2/pom.xml?rev=982028&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-2/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-2/pom.xml Tue Aug 3 20:35:51 2010
@@ -0,0 +1,68 @@
+<?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-2</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: Boostrap :: Group-2</name>
+
+ <properties>
+ <itPluginVersion>2.1-SNAPSHOT</itPluginVersion>
+ </properties>
+
+ <dependencies>
+ <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.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.5.5</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-2/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-3/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-3/pom.xml?rev=982028&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-3/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-3/pom.xml Tue Aug 3 20:35:51 2010
@@ -0,0 +1,259 @@
+<?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-3</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: Boostrap :: Group-3</name>
+
+ <properties>
+ <itPluginVersion>2.1-SNAPSHOT</itPluginVersion>
+ </properties>
+
+ <dependencies>
+ <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-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-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>
+ </dependencies>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-3/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-3/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-4/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-4/pom.xml?rev=982028&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-4/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-4/pom.xml Tue Aug 3 20:35:51 2010
@@ -0,0 +1,50 @@
+<?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-4</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: Boostrap :: Group-4</name>
+
+ <properties>
+ <itPluginVersion>2.1-SNAPSHOT</itPluginVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-ant-based</artifactId>
+ <version>${itPluginVersion}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-4/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-4/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision