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 02:36:36 UTC
svn commit: r981712 [9/10] - in
/maven/core-integration-testing/trunk/core-it-suite: ./
src/test/java/org/apache/maven/it/ src/test/resources-filtered/
src/test/resources/bootstrap/ src/test/resources/it0041/
src/test/resources/mng-0294/ src/test/resou...
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng4461ArtifactUploa
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4461" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng4464PlatformIndep
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4464" );
- Verifier verifier = new Verifier( new File( testDir, "aggregator" ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( testDir, "aggregator" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "../sub/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4464" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java Tue Aug 3 00:36:19 2010
@@ -52,7 +52,7 @@ public class MavenITmng4465PluginPrefixF
// phase 1: get the metadata into the local repo
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4465" );
@@ -68,7 +68,7 @@ public class MavenITmng4465PluginPrefixF
// phase 2: re-try with the remote repo being inaccessible (due to bad URL)
- verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8",
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java Tue Aug 3 00:36:19 2010
@@ -135,7 +135,7 @@ public class MavenITmng4469Authenticated
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4469" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java Tue Aug 3 00:36:19 2010
@@ -177,7 +177,7 @@ public class MavenITmng4470Authenticated
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4470/" + project );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8",
Collections.singletonMap( "@port@", Integer.toString( port ) ) );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng4474PerLookupWago
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4474" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java Tue Aug 3 00:36:19 2010
@@ -50,7 +50,7 @@ public class MavenITmng4479ProjectLevelP
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4479" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4479" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng4482ForcePluginSn
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4482" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng4482" );
verifier.getCliOptions().add( "-s" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,7 @@ public class MavenITmng4488ValidateExter
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4488" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4488" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java Tue Aug 3 00:36:19 2010
@@ -88,7 +88,7 @@ public class MavenITmng4489MirroringOfEx
try
{
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4489" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng4498IgnoreBrokenM
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4498" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4498" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java Tue Aug 3 00:36:19 2010
@@ -88,7 +88,7 @@ public class MavenITmng4500NoUpdateOfTim
server.setHandler( handlerList );
server.start();
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
try
{
verifier.setAutoclean( false );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,7 @@ public class MavenITmng4522FailUponMissi
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4522" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4522" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng4526MavenProjectA
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4526" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4526" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java Tue Aug 3 00:36:19 2010
@@ -51,7 +51,7 @@ public class MavenITmng4528ExcludeWagons
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4528" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,7 @@ public class MavenITmng4536RequiresNoPro
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4536" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "mod-a/target" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng4544ActiveCompone
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4544" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng4553CoreArtifactF
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4553" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4553" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java Tue Aug 3 00:36:19 2010
@@ -88,7 +88,7 @@ public class MavenITmng4554PluginPrefixM
server.setHandler( handlerList );
server.start();
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
try
{
verifier.setAutoclean( false );
@@ -165,7 +165,7 @@ public class MavenITmng4554PluginPrefixM
server.setHandler( handlerList );
server.start();
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
try
{
verifier.setAutoclean( false );
@@ -245,7 +245,7 @@ public class MavenITmng4554PluginPrefixM
server.setHandler( handlerList );
server.start();
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
try
{
verifier.setAutoclean( false );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java Tue Aug 3 00:36:19 2010
@@ -81,7 +81,7 @@ public class MavenITmng4555MetaversionRe
server.setHandler( repoHandler );
server.start();
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4555" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java Tue Aug 3 00:36:19 2010
@@ -88,7 +88,7 @@ public class MavenITmng4561MirroringOfPl
try
{
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4561" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,7 @@ public class MavenITmng4572ModelVersionS
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4572" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng4580ProjectLevelP
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4580" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "sub/target" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMngtTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMngtTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMngtTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMngtTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng4586PluginPrefixR
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4586" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4586" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng4590ImportedPomUs
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4590" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4590" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng4600DependencyOpt
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4600/model" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
@@ -70,7 +70,7 @@ public class MavenITmng4600DependencyOpt
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4600/resolution" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4600" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng4618AggregatorBui
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4618" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng4625SettingsXmlIn
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4625" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setSystemProperty( "test.prop", "&x=y<>" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng4629NoPomValidati
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4629" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
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=981712&r1=981711&r2=981712&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 00:36:19 2010
@@ -44,7 +44,7 @@ public class MavenITmng4633DualCompilerE
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4633" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
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/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng4644StrictPomPars
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4644" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
try
{
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=981712&r1=981711&r2=981712&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 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng4654ArtifactHandl
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4654" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4654" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java Tue Aug 3 00:36:19 2010
@@ -52,7 +52,7 @@ public class MavenITmng4666CoreRealmImpo
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4666" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven", "maven-model", "0.1-stub" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng4677DisabledPlugi
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4677" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "child-1/target" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng4679SnapshotUpdat
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4679" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng4679" );
verifier.getCliOptions().add( "-s" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMngtOverridenByProfileTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMngtOverridenByProfileTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMngtOverridenByProfileTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMngtOverridenByProfileTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng4684DistMngtOverr
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4684" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getCliOptions().add( "-Pmng4684" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java Tue Aug 3 00:36:19 2010
@@ -50,7 +50,7 @@ public class MavenITmng4696MavenProjectD
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4696" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng4696" );
verifier.getCliOptions().add( "-s" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng4720DependencyMan
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4720" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng4720" );
verifier.getCliOptions().add( "-s" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng4721OptionalPlugi
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4721" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng4721" );
verifier.getCliOptions().add( "-s" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java Tue Aug 3 00:36:19 2010
@@ -90,7 +90,7 @@ public class MavenITmng4729MirrorProxyAu
try
{
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4729" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng4745PluginVersion
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4745" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.setForkJvm( true );
verifier.deleteArtifacts( "org.apache.maven.its.mng4745" );
@@ -81,7 +81,7 @@ public class MavenITmng4745PluginVersion
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4745" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.setForkJvm( true );
verifier.deleteArtifacts( "org.apache.maven.its.mng4745" );
@@ -114,7 +114,7 @@ public class MavenITmng4745PluginVersion
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4745" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.setForkJvm( true );
verifier.deleteArtifacts( "org.apache.maven.its.mng4745" );
Added: 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=981712&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources-filtered/settings.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources-filtered/settings.xml Tue Aug 3 00:36:19 2010
@@ -0,0 +1,69 @@
+<?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.
+-->
+
+<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>http://repository.sonatype.org/content/repositories/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>central</id>
+ <name>Apache Maven Integration Testing Repository</name>
+ <url>http://repository.sonatype.org/content/repositories/public</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.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources-filtered/settings.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/settings.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/settings.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/settings.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/settings.xml Tue Aug 3 00:36:19 2010
@@ -22,24 +22,12 @@ under the License.
<settings>
<profiles>
<profile>
- <id>maven-core-it-repo</id>
- <!-- TODO: Remove once IT support plugins/artifacts have been released -->
+ <id>it-defaults</id>
<repositories>
<repository>
- <id>maven.it</id>
- <name>Apache Maven Integration Testing Snapshot Repository</name>
- <url>http://repository.sonatype.org/content/repositories/maven.snapshots</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
+ <id>central</id>
+ <name>Apache Maven Integration Testing Repository</name>
+ <url>http://repository.sonatype.org/content/repositories/public</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -50,20 +38,9 @@ under the License.
</repositories>
<pluginRepositories>
<pluginRepository>
- <id>maven.it</id>
- <name>Apache Maven Integration Testing Snapshot Repository</name>
- <url>http://repository.sonatype.org/content/repositories/maven.snapshots</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
+ <id>central</id>
+ <name>Apache Maven Integration Testing Repository</name>
+ <url>http://repository.sonatype.org/content/repositories/public</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -75,6 +52,6 @@ under the License.
</profile>
</profiles>
<activeProfiles>
- <activeProfile>maven-core-it-repo</activeProfile>
+ <activeProfile>it-defaults</activeProfile>
</activeProfiles>
</settings>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0041/settings.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0041/settings.xml?rev=981712&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0041/settings.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0041/settings.xml Tue Aug 3 00:36:19 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.
+-->
+
+<settings>
+ <profiles>
+ <profile>
+ <id>it-defaults</id>
+ <repositories>
+ <repository>
+ <id>central</id>
+ <url>http://repo1.maven.org/maven2</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>central</id>
+ <url>http://repo1.maven.org/maven2</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </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/it0041/settings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0041/settings.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0294/user-settings.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0294/user-settings.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0294/user-settings.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0294/user-settings.xml Tue Aug 3 00:36:19 2010
@@ -1,5 +1,58 @@
+<?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.
+-->
+
<settings>
<activeProfiles>
<activeProfile>test-profile</activeProfile>
+ <activeProfile>it-defaults</activeProfile>
</activeProfiles>
+ <profiles>
+ <profile>
+ <id>it-defaults</id>
+ <repositories>
+ <repository>
+ <id>central</id>
+ <name>Apache Maven Integration Testing Repository</name>
+ <url>http://repository.sonatype.org/content/repositories/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>central</id>
+ <name>Apache Maven Integration Testing Repository</name>
+ <url>http://repository.sonatype.org/content/repositories/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
</settings>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/settings-template.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/settings-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/settings-template.xml Tue Aug 3 00:36:19 2010
@@ -22,8 +22,8 @@ under the License.
<settings>
<mirrors>
<mirror>
- <!-- make sure central isn't touched -->
- <id>test-mirror</id>
+ <!-- disable remote trips to speed things up -->
+ <id>central</id>
<url>@baseurl@/repo-null</url>
<mirrorOf>central</mirrorOf>
</mirror>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0479/test/settings.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0479/test/settings.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0479/test/settings.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0479/test/settings.xml Tue Aug 3 00:36:19 2010
@@ -25,7 +25,7 @@ under the License.
<!--
Make sure we also override the repo definition in case a repo manager is setup.
-->
- <id>it0043</id>
+ <id>it-defaults</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/settings-template.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/settings-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/settings-template.xml Tue Aug 3 00:36:19 2010
@@ -20,13 +20,20 @@ under the License.
-->
<settings>
+ <mirrors>
+ <mirror>
+ <!-- disable remote trips to speed things up -->
+ <id>central</id>
+ <mirrorOf>central</mirrorOf>
+ <url>@baseurl@/target/null</url>
+ </mirror>
+ </mirrors>
<profiles>
<profile>
<id>maven-core-it-repo</id>
<repositories>
<repository>
- <!-- NOTE: Override central to make sure the test queries only the test repo -->
- <id>central</id>
+ <id>maven-core-it</id>
<url>@baseurl@/repo</url>
<releases>
<checksumPolicy>ignore</checksumPolicy>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0507/settings.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0507/settings.xml?rev=981712&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0507/settings.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0507/settings.xml Tue Aug 3 00:36:19 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.
+-->
+
+<settings>
+ <profiles>
+ <profile>
+ <id>it-defaults</id>
+ <repositories>
+ <repository>
+ <id>central</id>
+ <url>http://repo1.maven.org/maven2</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>central</id>
+ <url>http://repo1.maven.org/maven2</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </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/mng-0507/settings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0507/settings.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/settings-template.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/settings-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/settings-template.xml Tue Aug 3 00:36:19 2010
@@ -20,6 +20,14 @@ under the License.
-->
<settings>
+ <mirrors>
+ <mirror>
+ <!-- disable remote trips to speed things up -->
+ <id>central</id>
+ <url>@baseurl@/repo-null</url>
+ <mirrorOf>central</mirrorOf>
+ </mirror>
+ </mirrors>
<proxies>
<proxy>
<!-- NOTE: Set as inactive so should not be used, even if the one and only proxy configured -->
@@ -38,7 +46,7 @@ under the License.
</activation>
<repositories>
<repository>
- <id>central</id>
+ <id>maven-core-it</id>
<url>http://@host@:@port@/</url>
<releases>
<checksumPolicy>ignore</checksumPolicy>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2741/settings.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2741/settings.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2741/settings.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2741/settings.xml Tue Aug 3 00:36:19 2010
@@ -25,7 +25,7 @@ under the License.
</pluginGroups>
<profiles>
<profile>
- <id>maven-core-it-repo</id>
+ <id>it-defaults</id>
<repositories>
<repository>
<id>central</id>
@@ -53,6 +53,6 @@ under the License.
</profile>
</profiles>
<activeProfiles>
- <activeProfile>maven-core-it-repo</activeProfile>
+ <activeProfile>it-defaults</activeProfile>
</activeProfiles>
</settings>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2865/central/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2865/central/settings-template.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2865/central/settings-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2865/central/settings-template.xml Tue Aug 3 00:36:19 2010
@@ -22,7 +22,7 @@ under the License.
<settings>
<mirrors>
<mirror>
- <id>test-mirror</id>
+ <id>central</id>
<url>@baseurl@/../repo</url>
<mirrorOf>*</mirrorOf>
</mirror>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2865/external/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2865/external/settings-template.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2865/external/settings-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2865/external/settings-template.xml Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ under the License.
from central fail, too.
-->
<mirror>
- <id>central-mirror</id>
+ <id>central</id>
<url>@baseurl@/null</url>
<mirrorOf>central</mirrorOf>
</mirror>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2865/file/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2865/file/settings-template.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2865/file/settings-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2865/file/settings-template.xml Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ under the License.
from central fail, too.
-->
<mirror>
- <id>central-mirror</id>
+ <id>central</id>
<url>@baseurl@/null</url>
<mirrorOf>central</mirrorOf>
</mirror>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2865/localhost/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2865/localhost/settings-template.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2865/localhost/settings-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2865/localhost/settings-template.xml Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ under the License.
from central fail, too.
-->
<mirror>
- <id>central-mirror</id>
+ <id>central</id>
<url>@baseurl@/null</url>
<mirrorOf>central</mirrorOf>
</mirror>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/settings-template.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/settings-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/settings-template.xml Tue Aug 3 00:36:19 2010
@@ -43,7 +43,7 @@ under the License.
<mirrors>
<mirror>
- <id>test-a</id>
+ <id>central</id>
<url>@baseurl@/null0</url>
<mirrorOf>*</mirrorOf>
</mirror>
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=981712&r1=981711&r2=981712&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 00:36:19 2010
@@ -63,7 +63,7 @@ under the License.
<mirrors>
<mirror>
- <id>test-a</id>
+ <id>central</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-3461/test-3/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/settings-template.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/settings-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/settings-template.xml Tue Aug 3 00:36:19 2010
@@ -43,7 +43,7 @@ under the License.
<mirrors>
<mirror>
- <id>test-a</id>
+ <id>central</id>
<url>http://maven.apache.org/null</url>
<!--
The explicit mismatch with maven-core-it should be dominant over the wildcard, even if the wildcard
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3477/settings.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3477/settings.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3477/settings.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3477/settings.xml Tue Aug 3 00:36:19 2010
@@ -20,12 +20,19 @@ under the License.
-->
<settings>
+ <mirrors>
+ <mirror>
+ <id>central</id>
+ <url>http://localhost:54312/repo</url>
+ <mirrorOf>central</mirrorOf>
+ </mirror>
+ </mirrors>
<profiles>
<profile>
<id>maven-core-it-repo</id>
<repositories>
<repository>
- <id>central</id>
+ <id>maven-core-it</id>
<url>http://localhost:54312/repo</url>
<releases>
<checksumPolicy>ignore</checksumPolicy>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4068/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4068/settings-template.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4068/settings-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4068/settings-template.xml Tue Aug 3 00:36:19 2010
@@ -25,9 +25,14 @@ under the License.
<!-- NOTE: The id of the mirror should be used to lookup the credentials, not the id of the original repository. -->
<id>maven-core-it-mng-4068</id>
<name>Test Mirror</name>
- <mirrorOf>central</mirrorOf>
+ <mirrorOf>mng-4068</mirrorOf>
<url>http://localhost:@mirrorPort@/</url>
</mirror>
+ <mirror>
+ <id>central</id>
+ <mirrorOf>central</mirrorOf>
+ <url>@baseurl@/target/null</url>
+ </mirror>
</mirrors>
<servers>
<server>
@@ -41,7 +46,7 @@ under the License.
<id>mng-4068</id>
<repositories>
<repository>
- <id>central</id>
+ <id>mng-4068</id>
<url>file://null</url>
<releases>
<checksumPolicy>ignore</checksumPolicy>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4150/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4150/settings-template.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4150/settings-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4150/settings-template.xml Tue Aug 3 00:36:19 2010
@@ -20,13 +20,21 @@ under the License.
-->
<settings>
+ <mirrors>
+ <mirror>
+ <!-- disable remote trips to speed things up -->
+ <id>central</id>
+ <url>@baseurl@/target/null</url>
+ <mirrorOf>central</mirrorOf>
+ </mirror>
+ </mirrors>
<profiles>
<profile>
<id>maven-core-it-repo</id>
<repositories>
<repository>
<!-- NOTE: Override central to make sure the test queries only the test repo -->
- <id>central</id>
+ <id>maven-core-it</id>
<url>@baseurl@/repo</url>
<releases>
<checksumPolicy>ignore</checksumPolicy>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4190/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4190/pom.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4190/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4190/pom.xml Tue Aug 3 00:36:19 2010
@@ -28,7 +28,9 @@ under the License.
<name>Maven Integration Test :: MNG-4190</name>
<description>
- Test that
+ Test that artifact repositories are merged if they are mirrored by the same repo. If n repos map to one
+ mirror, there is no point in making n trips to the same mirror. However, the effective/merged repo needs
+ to account for possibly different policies of the original repos.
</description>
<repositories>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4190/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4190/settings-template.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4190/settings-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4190/settings-template.xml Tue Aug 3 00:36:19 2010
@@ -22,7 +22,7 @@ under the License.
<settings>
<mirrors>
<mirror>
- <id>maven-core-it-repo</id>
+ <id>central</id>
<url>@baseurl@/repo</url>
<mirrorOf>*</mirrorOf>
</mirror>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4317/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4317/settings-template.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4317/settings-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4317/settings-template.xml Tue Aug 3 00:36:19 2010
@@ -22,7 +22,7 @@ under the License.
<settings>
<mirrors>
<mirror>
- <id>central-blocker</id>
+ <id>central</id>
<mirrorOf>central</mirrorOf>
<url>@baseurl@/void</url>
</mirror>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4347/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4347/settings-template.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4347/settings-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4347/settings-template.xml Tue Aug 3 00:36:19 2010
@@ -23,7 +23,7 @@ under the License.
<!-- if this profile is used, the import-scoped POM will be resolvable. -->
<profiles>
<profile>
- <id>central-override</id>
+ <id>it-defaults</id>
<repositories>
<repository>
<id>central</id>
@@ -36,9 +36,21 @@ under the License.
</snapshots>
</repository>
</repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>central</id>
+ <url>@baseurl@/remote-repository</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
</profile>
</profiles>
<activeProfiles>
- <activeProfile>central-override</activeProfile>
+ <activeProfile>it-defaults</activeProfile>
</activeProfiles>
</settings>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4367/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4367/settings-template.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4367/settings-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4367/settings-template.xml Tue Aug 3 00:36:19 2010
@@ -24,7 +24,7 @@ under the License.
<mirror>
<id>test</id>
<url>@mirrorurl@</url>
- <mirrorOf>*</mirrorOf>
+ <mirrorOf>*,!central</mirrorOf>
<mirrorOfLayouts>@layouts@</mirrorOfLayouts>
</mirror>
</mirrors>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4401/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4401/settings-template.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4401/settings-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4401/settings-template.xml Tue Aug 3 00:36:19 2010
@@ -26,10 +26,15 @@ under the License.
<mirrorOf>central</mirrorOf>
<url>@baseurl@/repo-2</url>
</mirror>
+ <mirror>
+ <id>central</id>
+ <mirrorOf>maven.it</mirrorOf>
+ <url>http://repository.sonatype.org/content/repositories/public</url>
+ </mirror>
</mirrors>
<profiles>
<profile>
- <id>maven-core-it-repo</id>
+ <id>it-defaults</id>
<repositories>
<!-- repo-1 has the right parent POM, repo-2 the unwanted one -->
<repository>
@@ -53,9 +58,22 @@ under the License.
</snapshots>
</repository>
</repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>maven.it</id>
+ <name>Apache Maven Integration Testing Repository</name>
+ <url>http://localhost</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
</profile>
</profiles>
<activeProfiles>
- <activeProfile>maven-core-it-repo</activeProfile>
+ <activeProfile>it-defaults</activeProfile>
</activeProfiles>
</settings>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4413/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4413/settings-template.xml?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4413/settings-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4413/settings-template.xml Tue Aug 3 00:36:19 2010
@@ -27,7 +27,7 @@ under the License.
<url>http://localhost:@port@/</url>
</mirror>
<mirror>
- <id>central-mirror</id>
+ <id>central</id>
<mirrorOf>central</mirrorOf>
<url>@baseurl@/target/null</url>
</mirror>