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 [6/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/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=981712&r1=981711&r2=981712&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 00:36:19 2010
@@ -51,13 +51,13 @@ public class MavenITmng3710PollutedClone
Verifier verifier;
- verifier = new Verifier( pluginDir.getAbsolutePath() );
+ verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectsDir.getAbsolutePath() );
+ verifier = newVerifier( projectsDir.getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@@ -84,13 +84,13 @@ public class MavenITmng3710PollutedClone
Verifier verifier;
- verifier = new Verifier( pluginsDir.getAbsolutePath() );
+ verifier = newVerifier( pluginsDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
List goals = new ArrayList();
goals.add( "org.apache.maven.its.mng3710:maven-mng3710-directInvoke-plugin:1:run" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java Tue Aug 3 00:36:19 2010
@@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Properties;
/**
@@ -55,7 +53,7 @@ public class MavenITmng3714ToolchainsCli
new File( javaHome, "bin/javac").createNewFile();
new File( javaHome, "bin/javac.exe").createNewFile();
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
Properties properties = verifier.newDefaultFilterProperties();
properties.setProperty( "@javaHome@", javaHome.getAbsolutePath() );
@@ -63,9 +61,7 @@ public class MavenITmng3714ToolchainsCli
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- List cliOptions = new ArrayList();
- cliOptions.add( "--toolchains toolchains.xml" );
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "--toolchains toolchains.xml" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
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=981712&r1=981711&r2=981712&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 00:36:19 2010
@@ -50,13 +50,13 @@ public class MavenITmng3716AggregatorFor
Verifier verifier;
- verifier = new Verifier( pluginDir.getAbsolutePath() );
+ verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectsDir.getAbsolutePath() );
+ verifier = newVerifier( projectsDir.getAbsolutePath() );
verifier.executeGoal( "org.apache.maven.its.mng3716:maven-mng3716-plugin:1:run" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng3719PomExecutionO
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3719" );
- 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/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=981712&r1=981711&r2=981712&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 00:36:19 2010
@@ -55,13 +55,13 @@ public class MavenITmng3723ConcreteParen
Verifier verifier;
- verifier = new Verifier( pluginDir.getAbsolutePath() );
+ verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.executeGoal( "validate" );
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=981712&r1=981711&r2=981712&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 00:36:19 2010
@@ -50,13 +50,13 @@ public class MavenITmng3724ExecutionProj
Verifier verifier;
- verifier = new Verifier( pluginDir.getAbsolutePath() );
+ verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.executeGoal( "package" );
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=981712&r1=981711&r2=981712&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 00:36:19 2010
@@ -64,13 +64,13 @@ public class MavenITmng3729MultiForkAggr
Verifier verifier;
- verifier = new Verifier( pluginDir.getAbsolutePath() );
+ verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java Tue Aug 3 00:36:19 2010
@@ -52,7 +52,7 @@ public class MavenITmng3732ActiveProfile
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3732" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getCliOptions().add( "--settings" );
@@ -71,10 +71,12 @@ public class MavenITmng3732ActiveProfile
ids.add( props.getProperty( "project.activeProfiles.0.id", "" ) );
ids.add( props.getProperty( "project.activeProfiles.1.id", "" ) );
ids.add( props.getProperty( "project.activeProfiles.2.id", "" ) );
+ ids.add( props.getProperty( "project.activeProfiles.3.id", "" ) );
+ ids.remove( "it-defaults" );
Collections.sort( ids );
assertEquals( Arrays.asList( new String[] { "pom", "profiles", "settings" } ), ids );
- assertEquals( "3", props.getProperty( "project.activeProfiles" ) );
+ assertEquals( "4", props.getProperty( "project.activeProfiles" ) );
assertEquals( "PASSED-1", props.getProperty( "project.properties.pomProperty" ) );
assertEquals( "PASSED-2", props.getProperty( "project.properties.settingsProperty" ) );
@@ -84,10 +86,12 @@ public class MavenITmng3732ActiveProfile
{
ids.add( props.getProperty( "project.activeProfiles.0.id", "" ) );
ids.add( props.getProperty( "project.activeProfiles.1.id", "" ) );
+ ids.add( props.getProperty( "project.activeProfiles.2.id", "" ) );
+ ids.remove( "it-defaults" );
Collections.sort( ids );
assertEquals( Arrays.asList( new String[] { "pom", "settings" } ), ids );
- assertEquals( "2", props.getProperty( "project.activeProfiles" ) );
+ assertEquals( "3", props.getProperty( "project.activeProfiles" ) );
assertEquals( "PASSED-1", props.getProperty( "project.properties.pomProperty" ) );
assertEquals( "PASSED-2", props.getProperty( "project.properties.settingsProperty" ) );
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=981712&r1=981711&r2=981712&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 00:36:19 2010
@@ -52,12 +52,12 @@ public class MavenITmng3740SelfReferenti
Verifier verifier;
- verifier = new Verifier( v1.getAbsolutePath() );
+ verifier = newVerifier( v1.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( v2.getAbsolutePath() );
+ verifier = newVerifier( v2.getAbsolutePath() );
verifier.executeGoal( "package" );
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=981712&r1=981711&r2=981712&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 00:36:19 2010
@@ -48,13 +48,13 @@ public class MavenITmng3743ForkWithPlugi
File pluginsDir = new File( testDir, "plugins" );
File projectDir = new File( testDir, "project" );
- Verifier verifier = new Verifier( pluginsDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( pluginsDir.getAbsolutePath() );
verifier.deleteArtifacts( "org.apache.maven.its.mng3743" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
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=981712&r1=981711&r2=981712&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 00:36:19 2010
@@ -20,8 +20,6 @@ package org.apache.maven.it;
*/
import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
@@ -52,12 +50,12 @@ public class MavenITmng3746POMPropertyOv
Verifier verifier;
- verifier = new Verifier( pluginDir.getAbsolutePath() );
+ verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -74,19 +72,16 @@ public class MavenITmng3746POMPropertyOv
Verifier verifier;
- verifier = new Verifier( pluginDir.getAbsolutePath() );
+ verifier = newVerifier( pluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier = new Verifier( projectDir.getAbsolutePath() );
+ verifier = newVerifier( projectDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- cliOptions.add( "-Dtest.verification=cli" );
- cliOptions.add( "-Dtest.usingCliValue=true" );
- cliOptions.add( "-Djava.version=cli" );
-
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "-Dtest.verification=cli" );
+ verifier.getCliOptions().add( "-Dtest.usingCliValue=true" );
+ verifier.getCliOptions().add( "-Djava.version=cli" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng3747PrefixedPathE
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3747" );
- 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/MavenITmng3748BadSettingsXmlTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java Tue Aug 3 00:36:19 2010
@@ -50,7 +50,7 @@ public class MavenITmng3748BadSettingsXm
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3748" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
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/MavenITmng3760BaseUriPropertyTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java Tue Aug 3 00:36:19 2010
@@ -20,7 +20,6 @@ package org.apache.maven.it;
*/
import java.io.File;
-import java.util.Collections;
import java.util.List;
import java.util.Properties;
@@ -47,7 +46,7 @@ public class MavenITmng3760BaseUriProper
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3760" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log-basic.txt" );
@@ -68,11 +67,10 @@ public class MavenITmng3760BaseUriProper
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3760" );
// check that setting baseUri doesn't override project value
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- List cliOptions = Collections.singletonList( "-DbaseUri=myBaseUri" );
- verifier.setCliOptions( cliOptions );
+ verifier.getCliOptions().add( "-DbaseUri=myBaseUri" );
verifier.setLogFileName( "log-sysprop.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng3766ToolchainsFro
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3766" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getCliOptions().add( "--toolchains" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng3769ExclusionRelo
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3769" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3769" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng3796ClassImportIn
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3796" );
- 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/MavenITmng3805ExtensionClassPathOrderingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3805ExtensionClas
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3805" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3805" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng3807PluginConfigE
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3807" );
- 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/MavenITmng3808ReportInheritenceOrderingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritenceOrderingTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritenceOrderingTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritenceOrderingTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3808ReportInherit
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3808" );
testDir = new File( testDir, "child" );
- 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/MavenITmng3810BadProfileActivationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java Tue Aug 3 00:36:19 2010
@@ -45,7 +45,7 @@ public class MavenITmng3810BadProfileAct
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3810/property" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
try
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3811ReportingPlug
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3811" );
- Verifier verifier = new Verifier( new File( testDir, "child" ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( testDir, "child" ).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/MavenITmng3813PluginClassPathOrderingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3813PluginClassPa
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3813" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3813" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng3814BogusProjectC
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3814" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3814" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java Tue Aug 3 00:36:19 2010
@@ -50,7 +50,7 @@ public class MavenITmng3819PluginDepPlex
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3819" );
- 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/MavenITmng3821EqualPluginExecIdsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3821EqualPluginEx
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3821" );
- 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/MavenITmng3822BasedirAlignedInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3822BasedirAligne
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3822" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "initialize" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3827PluginConfigT
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3827" );
- 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/MavenITmng3831PomInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng3831PomInterpolat
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3831" );
File child = new File( testDir, "child" );
- Verifier verifier = new Verifier( child.getAbsolutePath() );
+ Verifier verifier = newVerifier( child.getAbsolutePath() );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng3833PomInterpolat
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3833" );
- 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/MavenITmng3836PluginConfigInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3836PluginConfigI
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3836" );
- Verifier verifier = new Verifier( new File( testDir, "child" ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( testDir, "child" ).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/MavenITmng3838EqualPluginDepsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java Tue Aug 3 00:36:19 2010
@@ -46,7 +46,7 @@ public class MavenITmng3838EqualPluginDe
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3838" );
- 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/MavenITmng3839PomParsingCoalesceTextTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3839PomParsingCoa
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3839" );
- 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/MavenITmng3843PomInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java Tue Aug 3 00:36:19 2010
@@ -51,7 +51,7 @@ public class MavenITmng3843PomInheritanc
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3843" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "test-1/target" );
verifier.deleteDirectory( "test-2/target" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3845LimitedPomInh
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3845" );
- Verifier verifier = new Verifier( new File( testDir, "child" ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( testDir, "child" ).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/MavenITmng3846PomInheritanceUrlAdjustmentTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3846PomInheritanc
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3846" );
- Verifier verifier = new Verifier( new File( testDir, "sub" ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( testDir, "sub" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
@@ -79,7 +79,7 @@ public class MavenITmng3846PomInheritanc
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3846" );
- Verifier verifier = new Verifier( new File( testDir, "another-parent/sub" ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( testDir, "another-parent/sub" ).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/MavenITmng3852PluginConfigWithHeterogeneousListTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng3852PluginConfigW
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3852" );
- 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/MavenITmng3853ProfileInjectedDistReposTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java Tue Aug 3 00:36:19 2010
@@ -23,7 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-import java.util.Collections;
import java.util.Properties;
/**
@@ -53,10 +52,10 @@ public class MavenITmng3853ProfileInject
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3853" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.setCliOptions( Collections.singletonList( "-Pcoreit" ) );
+ verifier.getCliOptions().add( "-Pcoreit" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3863AutoPluginGro
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3863" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
try
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3864PerExecPlugin
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3864" );
- 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/MavenITmng3866PluginConfigInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng3866PluginConfigI
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3866" );
- Verifier verifier = new Verifier( new File( testDir, "sub" ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( testDir, "sub" ).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/MavenITmng3872ProfileActivationInRelocatedPomTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3872ProfileActiva
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3872" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3872" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java Tue Aug 3 00:36:19 2010
@@ -65,7 +65,7 @@ public class MavenITmng3873MultipleExecu
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3873" );
- Verifier verifier = new Verifier( new File( testDir, project ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( testDir, project ).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/MavenITmng3877BasedirAlignedModelTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3877BasedirAligne
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3877" );
- 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/MavenITmng3885UniqueVersionFromParentProfileTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng3885UniqueVersion
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3885" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setLogFileName( "log-f.txt" );
verifier.setAutoclean( false );
verifier.deleteDirectory( "repo-f" );
@@ -71,7 +71,7 @@ public class MavenITmng3885UniqueVersion
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3885" );
- Verifier verifier = new Verifier( new File( testDir, "sub" ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( testDir, "sub" ).getAbsolutePath() );
verifier.setLogFileName( "log-f.txt" );
verifier.setAutoclean( false );
verifier.deleteDirectory( "repo-f" );
@@ -93,7 +93,7 @@ public class MavenITmng3885UniqueVersion
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3885" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setLogFileName( "log-t.txt" );
verifier.setAutoclean( false );
verifier.deleteDirectory( "repo-t" );
@@ -116,7 +116,7 @@ public class MavenITmng3885UniqueVersion
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3885" );
- Verifier verifier = new Verifier( new File( testDir, "sub" ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( testDir, "sub" ).getAbsolutePath() );
verifier.setLogFileName( "log-t.txt" );
verifier.setAutoclean( false );
verifier.deleteDirectory( "repo-t" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java Tue Aug 3 00:36:19 2010
@@ -66,7 +66,7 @@ public class MavenITmng3886ExecutionGoal
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3886" );
- Verifier verifier = new Verifier( new File( testDir, project ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( testDir, project ).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/MavenITmng3887PluginExecutionOrderTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java Tue Aug 3 00:36:19 2010
@@ -66,7 +66,7 @@ public class MavenITmng3887PluginExecuti
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3887" );
- Verifier verifier = new Verifier( new File( testDir, project ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( testDir, project ).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/MavenITmng3890TransitiveDependencyScopeUpdateTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java Tue Aug 3 00:36:19 2010
@@ -47,7 +47,7 @@ public class MavenITmng3890TransitiveDep
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3890" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3890" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java Tue Aug 3 00:36:19 2010
@@ -50,7 +50,7 @@ public class MavenITmng3892ReleaseDeploy
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3892" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "repo" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3892" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3899ExtensionInhe
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3899" );
- Verifier verifier = new Verifier( new File( testDir, "sub" ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( testDir, "sub" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3899" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3900ProfileProper
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3900" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getCliOptions().add( "-Pinterpolation-profile" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng3904NestedBuildDi
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3904" );
- 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/MavenITmng3906MergedPluginClassPathOrderingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3906MergedPluginC
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3906" );
- Verifier verifier = new Verifier( new File( testDir, "sub" ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( testDir, "sub" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3906" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java Tue Aug 3 00:36:19 2010
@@ -51,7 +51,7 @@ public class MavenITmng3916PluginExecuti
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3916" );
- Verifier verifier = new Verifier( new File( testDir, "sub" ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( testDir, "sub" ).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/MavenITmng3920PlexusComponentApiTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3920PlexusComponentApiTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3920PlexusComponentApiTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3920PlexusComponentApiTest.java Tue Aug 3 00:36:19 2010
@@ -43,7 +43,7 @@ public class MavenITmng3920PlexusCompone
Verifier verifier;
- verifier = new Verifier( dir.getAbsolutePath() );
+ verifier = newVerifier( dir.getAbsolutePath() );
verifier.executeGoal( "validate" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng3924XmlMarkupInte
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3924" );
- 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/MavenITmng3925MergedPluginExecutionOrderTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java Tue Aug 3 00:36:19 2010
@@ -66,7 +66,7 @@ public class MavenITmng3925MergedPluginE
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3925" );
- Verifier verifier = new Verifier( new File( new File( testDir, project ), "sub" ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( new File( testDir, project ), "sub" ).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/MavenITmng3927PluginDefaultExecutionConfigTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3927PluginDefault
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3927" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "process-resources" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933ProfilesXmlActivationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933ProfilesXmlActivationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933ProfilesXmlActivationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933ProfilesXmlActivationTest.java Tue Aug 3 00:36:19 2010
@@ -52,7 +52,7 @@ public class MavenITmng3933ProfilesXmlAc
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3933" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getSystemProperties().setProperty( "maven.profile.activator", "test" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java Tue Aug 3 00:36:19 2010
@@ -66,7 +66,7 @@ public class MavenITmng3937MergedPluginE
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3937" );
- Verifier verifier = new Verifier( new File( new File( testDir, project ), "sub" ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( new File( testDir, project ), "sub" ).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/MavenITmng3938MergePluginExecutionsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java Tue Aug 3 00:36:19 2010
@@ -68,7 +68,7 @@ public class MavenITmng3938MergePluginEx
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3938/" + project );
- Verifier verifier = new Verifier( new File( testDir, "sub" ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( testDir, "sub" ).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/MavenITmng3940EnvVarInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java Tue Aug 3 00:36:19 2010
@@ -66,7 +66,7 @@ public class MavenITmng3940EnvVarInterpo
envVars.put( "MAVEN_MNG_3940", "PASSED" );
}
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate", envVars );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java Tue Aug 3 00:36:19 2010
@@ -49,7 +49,7 @@ public class MavenITmng3941ExecutionProj
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3941" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "initialize" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java Tue Aug 3 00:36:19 2010
@@ -51,7 +51,7 @@ public class MavenITmng3943PluginExecuti
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3943" );
- Verifier verifier = new Verifier( new File( testDir, "sub" ).getAbsolutePath() );
+ Verifier verifier = newVerifier( new File( testDir, "sub" ).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/MavenITmng3944BasedirInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3944BasedirInterp
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3944" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getCliOptions().add( "-f" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java Tue Aug 3 00:36:19 2010
@@ -48,7 +48,7 @@ public class MavenITmng3947PluginDefault
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3947" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "org.apache.maven.plugins:maven-resources-plugin:resources" );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java?rev=981712&r1=981711&r2=981712&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java Tue Aug 3 00:36:19 2010
@@ -50,7 +50,7 @@ public class MavenITmng3948ParentResolut
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3948/test-1" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3948" );
verifier.filterFile( "profiles.xml", "profiles.xml", "UTF-8", verifier.newDefaultFilterProperties() );
@@ -72,7 +72,7 @@ public class MavenITmng3948ParentResolut
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3948/test-2" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3948" );
verifier.filterFile( "pom.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );