[MNG-7661] Replace deprecated 'verifier.executeGoal()'
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java
index 98d7f38..0596e41 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java
@@ -52,7 +52,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-plugin-touch", "1.0", "maven-plugin" );
- verifier.executeGoal( "process-sources" );
+ verifier.addCliArgument( "process-sources" );
+ verifier.execute();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFilePresent( "target/test-basedir-alignment/touch.txt" );
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java
index 7b4c483..2a051a9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java
@@ -52,7 +52,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyFilePresent( supportSpaceInXml ? "target/ pluginItem " : "target/pluginItem");
verifier.verifyFilePresent( "target/goalItem" );
verifier.verifyFileNotPresent( "target/bad-item" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java
index 3ff4d8e..eec6bc5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java
@@ -55,7 +55,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.it0010", "a", "0.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java
index a7da9c1..3fc7412 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java
@@ -52,7 +52,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java
index 281f28c..4e62340 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java
@@ -48,7 +48,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "child-project/target" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.execute();
verifier.verifyFilePresent( "target/touch-3.8.1.txt" );
verifier.verifyFilePresent( "child-project/target/child-touch-3.0.3.txt" );
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java
index 60d0585..908623b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java
@@ -52,7 +52,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
+ verifier.execute();
verifier.verifyArtifactPresent( "org.apache.maven.its.it0018", "managed-dep", "1.0.3", "jar" );
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java
index aaaaa8f..e9d9fe8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java
@@ -47,7 +47,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "process-resources" );
+ verifier.addCliArgument( "process-resources" );
+ verifier.execute();
verifier.verifyFilePresent( "target/classes/test.txt" );
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java
index 31c0b2d..3660603 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java
@@ -54,7 +54,8 @@
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.addCliOption( "-Pprofile-2" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.it0021", "a", "0.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java
index 1f62116..4aada10 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java
@@ -51,7 +51,8 @@
verifier.deleteDirectory( "target" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/test.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java
index 15b7fdb..77dba9a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/plugin-exec-configuration.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java
index 2b0ceae..9284d8f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/test.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java
index 02dbea6..dae0561 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java
@@ -50,7 +50,8 @@
verifier.deleteArtifact( "org.apache.maven.it", "maven-it-it0030-child-hierarchy", "1.0-SNAPSHOT", "jar" );
verifier.deleteArtifact( "org.apache.maven.it", "maven-it-it0030-child-project1", "1.0-SNAPSHOT", "jar" );
verifier.deleteArtifact( "org.apache.maven.it", "maven-it-it0030-child-project2", "1.0-SNAPSHOT", "jar" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyFilePresent( "child-hierarchy/project2/target/classes/org/apache/maven/it0001/Person.class" );
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java
index 7f6aae2..d842969 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java
@@ -47,7 +47,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java
index 8f4a46b..65a338a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java
@@ -56,7 +56,8 @@
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-f" );
verifier.addCliOption( "pom2.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/passed.log" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java
index a66bec5..80ec35a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java
@@ -56,7 +56,8 @@
verifier.deleteDirectory( "project/target" );
verifier.addCliOption( "-f" );
verifier.addCliOption( "project/pom2.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "project/target/passed.log" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java
index 9d0359a..b95fbad 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/maven-it-it0040-1.0-it.jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
index 71cce3d..52924ee 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
@@ -56,7 +56,8 @@
verifier.deleteArtifacts( "org.apache.maven", "maven-core-it-support", "1.2" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.2", "coreit-artifact" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java
index 2733c66..f73319f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java
@@ -50,7 +50,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-DperformRelease=true" );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/source-jar.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java
index 1436ce5..ac76ef4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java
@@ -49,7 +49,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/jar-jar.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java
index 356136e..4d5f22a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java
@@ -49,7 +49,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/first-exec.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java
index 83c7f47..a75d153 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java
@@ -50,7 +50,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getSystemProperties().setProperty( "jre.home", new File( testDir, "jdk/jre" ).getPath() );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadLines( "target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java
index 7798304..345ebe9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java
@@ -49,7 +49,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-setter:setter-touch" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-setter:setter-touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/fooValue" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java
index c6d6334..9bc611e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/foo2" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java
index 6206698..68767b1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java
index f1d20d2..4d01870 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java
@@ -57,7 +57,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Collection<String> lines = verifier.loadLines( "target/test.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java
index 55c3381..bfac0b2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java
index 7083199..81d1124 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java
@@ -60,7 +60,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java
index 1da4728..fb61323 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java
@@ -23,8 +23,6 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
import java.util.Properties;
import org.junit.jupiter.api.Test;
@@ -50,11 +48,11 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0090" );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- Map<String, String> envVars = new HashMap<>();
- envVars.put( "MAVEN_TEST_ENVAR", "MAVEN_TEST_ENVAR_VALUE" );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate", envVars );
+ verifier.setEnvironmentVariable( "MAVEN_TEST_ENVAR", "MAVEN_TEST_ENVAR_VALUE" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/env.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java
index d417431..b512dba 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java
@@ -83,7 +83,8 @@
public void testSnapshotUpdated()
throws Exception
{
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
@@ -94,7 +95,8 @@
FileUtils.fileWrite( artifact.getAbsolutePath(), "updatedArtifact" );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifyArtifactContent( "updatedArtifact" );
@@ -110,7 +112,8 @@
FileUtils.fileWrite( metadata.getAbsolutePath(),
constructMetadata( "1", System.currentTimeMillis() - TIME_OFFSET, true ) );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
@@ -120,7 +123,8 @@
metadata = new File( repository, "org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml" );
FileUtils.fileWrite( metadata.getAbsolutePath(), constructMetadata( "2", System.currentTimeMillis(), true ) );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifyArtifactContent( "updatedArtifact" );
@@ -142,7 +146,8 @@
FileUtils.fileWrite( metadata.getAbsolutePath(),
constructMetadata( "1", System.currentTimeMillis() - TIME_OFFSET, true ) );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
@@ -157,7 +162,8 @@
// update the remote file, but we shouldn't be looking
artifact.setLastModified( System.currentTimeMillis() );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifyArtifactContent( "localArtifact" );
@@ -172,7 +178,8 @@
constructMetadata( "2", System.currentTimeMillis() - 2000, true ) );
artifact.setLastModified( System.currentTimeMillis() );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifyArtifactContent( "originalArtifact" );
@@ -189,7 +196,8 @@
constructMetadata( "1", System.currentTimeMillis() - TIME_OFFSET, false ) );
metadata.setLastModified( System.currentTimeMillis() - TIME_OFFSET );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
@@ -199,7 +207,8 @@
metadata = new File( repository, "org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml" );
FileUtils.fileWrite( metadata.getAbsolutePath(), constructMetadata( "2", System.currentTimeMillis(), false ) );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifyArtifactContent( "updatedArtifact" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java
index 4975ead..36c427d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java
@@ -52,7 +52,8 @@
verifier.deleteDirectory( "target" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/auth.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java
index cf40dd8..8ba9896 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
- verifier.executeGoal( "clean" );
+ verifier.addCliArgument( "clean" );
+ verifier.execute();
verifier.verifyFilePresent( "target/clean-clean.txt" );
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java
index e793ab5..cda9c31 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
- verifier.executeGoal( "site-deploy" );
+ verifier.addCliArgument( "site-deploy" );
+ verifier.execute();
verifier.verifyFilePresent( "target/site-site.txt" );
verifier.verifyFilePresent( "target/site-deploy.txt" );
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java
index c5fd648..b0e1c10 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
- verifier.executeGoal( "deploy" );
+ verifier.addCliArgument( "deploy" );
+ verifier.execute();
if ( matchesVersionRange( "(2.0.1,3.0-alpha-1)" ) )
{
verifier.verifyFilePresent( "target/site-attach-descriptor.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java
index e0efd3d..2268298 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
- verifier.executeGoal( "deploy" );
+ verifier.addCliArgument( "deploy" );
+ verifier.execute();
verifier.verifyFilePresent( "target/resources-resources.txt" );
verifier.verifyFilePresent( "target/compiler-compile.txt" );
verifier.verifyFilePresent( "target/resources-test-resources.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java
index e5925fb..3d42cdd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
- verifier.executeGoal( "deploy" );
+ verifier.addCliArgument( "deploy" );
+ verifier.execute();
verifier.verifyFilePresent( "target/resources-resources.txt" );
verifier.verifyFilePresent( "target/compiler-compile.txt" );
verifier.verifyFilePresent( "target/resources-test-resources.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java
index 55232a7..c586297 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
- verifier.executeGoal( "deploy" );
+ verifier.addCliArgument( "deploy" );
+ verifier.execute();
verifier.verifyFilePresent( "target/resources-resources.txt" );
verifier.verifyFilePresent( "target/compiler-compile.txt" );
verifier.verifyFilePresent( "target/resources-test-resources.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java
index e4119c7..2e229dc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
- verifier.executeGoal( "deploy" );
+ verifier.addCliArgument( "deploy" );
+ verifier.execute();
verifier.verifyFilePresent( "target/resources-resources.txt" );
verifier.verifyFilePresent( "target/compiler-compile.txt" );
verifier.verifyFilePresent( "target/resources-test-resources.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java
index f6b7d25..1101adb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
- verifier.executeGoal( "deploy" );
+ verifier.addCliArgument( "deploy" );
+ verifier.execute();
verifier.verifyFilePresent( "target/ear-generate-application-xml.txt" );
verifier.verifyFilePresent( "target/resources-resources.txt" );
verifier.verifyFilePresent( "target/ear-ear.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java
index f166a47..ccb40fa 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
- verifier.executeGoal( "deploy" );
+ verifier.addCliArgument( "deploy" );
+ verifier.execute();
verifier.verifyFilePresent( "target/plugin-descriptor.txt" );
verifier.verifyFilePresent( "target/resources-resources.txt" );
verifier.verifyFilePresent( "target/compiler-compile.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java
index 93d48b7..6288c6e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( child.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/interpolated.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java
index 2599d45..5fb7159 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java
@@ -57,7 +57,8 @@
Verifier verifier = newVerifier( child.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/interpolated.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java
index 53d7a2d..7dd7075 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java
@@ -66,7 +66,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compileArtifacts = verifier.loadLines( "target/compile-artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java
index a3ae6b3..ef24a9e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java
@@ -257,7 +257,8 @@
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.setLogFileName( "log-" + scope + ".txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
return verifier;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java
index fcb7835..1c10e2c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
- verifier.executeGoals( Arrays.asList( new String[]{ "post-clean", "deploy", "site-deploy" } ) );
+ verifier.addCliArguments( "post-clean", "deploy", "site-deploy" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> expected = new ArrayList<>();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
index 9edf1d7..2b7eef2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
@@ -106,7 +106,8 @@
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/appassembler/repo/dep-0.1-20110726.105319-1.jar" );
@@ -124,7 +125,8 @@
verifier.deleteDirectory( "project/target" );
verifier.setLogFileName( "log2.txt" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( testDir.getAbsolutePath() );
@@ -144,7 +146,8 @@
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/appassembler/repo/dep-0.1-SNAPSHOT.jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java
index 647fc4f..2ce7a7c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java
@@ -50,7 +50,8 @@
Verifier verifier = newVerifier(new File(testDir.getAbsolutePath(), module).getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
- verifier.executeGoal("install");
+ verifier.addCliArgument("install");
+ verifier.execute();
if (expectedArtifact != null) {
verifier.verifyFilePresent(expectedArtifact);
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java
index c3e1082..a575bf3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java
@@ -57,7 +57,8 @@
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.addCliOption( "-Dbootstrap=" + getClass().getResource( "/bootstrap.txt" ).toURI().getPath() );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
index f1c7f06..5e2c54f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
@@ -63,7 +63,8 @@
verifier.setLogFileName( "log-ff.txt" );
try
{
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
catch ( VerificationException e )
@@ -97,7 +98,8 @@
verifier.deleteDirectory( "subproject3/target" );
verifier.addCliOption( "--fail-never" );
verifier.setLogFileName( "log-fn.txt" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.execute();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject1/target/touch.txt" );
@@ -128,7 +130,8 @@
verifier.setLogFileName( "log-fae.txt" );
try
{
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
catch ( VerificationException e )
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java
index d6ec278..e04637e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java
@@ -62,7 +62,8 @@
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "sub-1/target" );
verifier.deleteDirectory( "sub-1/sub-2/target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java
index fe8315a..7c1ae82 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> ccp = verifier.loadLines( "test-component-c/target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
index 67875c6..d27812e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
@@ -55,7 +55,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "subproject/target" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-no-project:light-touch" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-no-project:light-touch" );
+ verifier.execute();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject/target/touch.txt" );
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
index 613e86a..802f246 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
@@ -60,7 +60,8 @@
// dedicated CLI option only available since MNG-3914
verifier.addCliOption( "--global-settings" );
verifier.addCliOption( "global-settings.xml" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/test.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
index 837b590..3547658 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
@@ -60,7 +60,8 @@
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.addCliArgument( "-Dtouch.outputFile=target/file.txt" );
- verifier.executeGoal( "itprefix:touch" );
+ verifier.addCliArgument( "itprefix:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/file.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
index 59bdd36..c86a43a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
@@ -68,7 +68,8 @@
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// Maven 3.x prefers RELEASE over LATEST (see MNG-4206)
@@ -112,7 +113,8 @@
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "org.apache.maven.its.mng0449:maven-it-plugin-a:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.mng0449:maven-it-plugin-a:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// Maven 3.x prefers RELEASE over LATEST (see MNG-4206)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java
index be00b8e..91af0a1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java
@@ -59,7 +59,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
index cb8f703..3859567 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-configuration:2.1-SNAPSHOT:config" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-configuration:2.1-SNAPSHOT:config" );
+ verifier.execute();
verifier.verifyFilePresent( "target/build.txt" );
verifier.verifyFileNotPresent( "target/reporting.txt" );
verifier.verifyErrorFreeLog();
@@ -78,12 +79,14 @@
verifier.setAutoclean( false );
if ( matchesVersionRange( "(,3.0-alpha-1)" ) )
{
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-site:2.1-SNAPSHOT:generate" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-site:2.1-SNAPSHOT:generate" );
+ verifier.execute();
verifier.verifyFilePresent( "target/site/info.properties" );
}
else
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
Properties props = verifier.loadProperties( "target/config.properties" );
assertEquals( "maven-it-plugin-site", props.getProperty( "project.reporting.plugins.0.artifactId" ) );
assertNotEquals( "fail.properties", props.getProperty( "project.reporting.plugins.0.configuration.children.infoFile.0.value" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java
index 49515e1..25ed910 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java
@@ -56,9 +56,9 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- List<String> goals = Arrays.asList( new String[]{"org.apache.maven.its.plugins:maven-it-plugin-fork:fork",
- "org.apache.maven.its.plugins:maven-it-plugin-fork:fork-goal"} );
- verifier.executeGoals( goals );
+ verifier.addCliArguments( "org.apache.maven.its.plugins:maven-it-plugin-fork:fork",
+ "org.apache.maven.its.plugins:maven-it-plugin-fork:fork-goal" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/forked/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
index 067c84d..2ee8907 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
@@ -59,7 +59,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// Phase 2: Now run the test
@@ -71,7 +72,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/expression.properties" );
@@ -135,7 +137,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
@@ -154,7 +157,8 @@
verifier.addCliOption( "settings.xml" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build should have failed to resolve parent POM" );
}
@@ -173,7 +177,8 @@
verifier.addCliOption( "settings.xml" );
try
{
- verifier.executeGoal( "org.apache.maven.its.mng0479:maven-mng0479-plugin:0.1-SNAPSHOT:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.mng0479:maven-mng0479-plugin:0.1-SNAPSHOT:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build should have failed to resolve direct dependency" );
}
@@ -193,7 +198,8 @@
verifier.addCliOption( "settings.xml" );
try
{
- verifier.executeGoal( "org.apache.maven.its.mng0479:maven-mng0479-plugin:0.1-SNAPSHOT:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.mng0479:maven-mng0479-plugin:0.1-SNAPSHOT:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build should have failed to resolve transitive dependency" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
index 9e9dc5e..8301579 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-log-file:2.1-SNAPSHOT:reset" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-log-file:2.1-SNAPSHOT:reset" );
+ verifier.execute();
verifier.verifyFilePresent( "target/file.txt" );
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
index 67eb551..1f42e78 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
@@ -63,7 +63,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Collection<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
index 673158a..c2cbe2f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
@@ -59,7 +59,8 @@
verifier.deleteArtifacts( "org.apache.maven", "maven-core-it-support-old-location", "1.1" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java
index 6c7802d..0434228 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( new File( testDir, "child-project" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "process-resources" );
+ verifier.addCliArgument( "process-resources" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/plugin-mngt-config-1.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
index 446b335..081fbeb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
@@ -139,7 +139,8 @@
setUserHome( verifier, new File( testDir, "userhome" ) );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar" );
@@ -176,7 +177,8 @@
verifier.addCliOption( "settings.xml" );
// NOTE: The selection of the Turkish language for the JVM locale is essential part of the test
verifier.setEnvironmentVariable( "MAVEN_OPTS", "-Dsettings.security=" + new File( testDir, "settings~security.xml" ).getAbsolutePath() + " -Duser.language=tr" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar" );
@@ -201,7 +203,8 @@
verifier.addCliOption( "--encrypt-master-password" );
verifier.addCliOption( "test" );
verifier.setLogFileName( "log-emp.txt" );
- verifier.executeGoal( "-e" );
+ verifier.addCliArgument( "-e" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> log = verifier.loadLines( verifier.getLogFileName(), null );
@@ -213,7 +216,8 @@
verifier.addCliOption( "--encrypt-password" );
verifier.addCliOption( "testpass" );
verifier.setLogFileName( "log-ep.txt" );
- verifier.executeGoal( "-e" );
+ verifier.addCliArgument( "-e" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
log = verifier.loadLines( verifier.getLogFileName(), null );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java
index b945ea6..4c7fa23 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java
@@ -56,7 +56,8 @@
verifier.deleteDirectory( "target" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/test.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java
index 8b111fa..f2932b8d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java
@@ -53,17 +53,20 @@
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0612/dependency" );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0612/plugin" );
verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0612/project" );
verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java
index a6db0b9..249a870 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java
@@ -60,7 +60,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
// don't verify error free log
verifier.verifyArtifactPresent( "org.apache.maven.its.it0059", "test", "3.8.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java
index 9afa937..9f1a4d0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java
@@ -58,7 +58,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log-lifecycle.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
@@ -82,7 +83,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log-cli.txt" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-configuration:config" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-configuration:config" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java
index 8860d6f..d1c5ae1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java
@@ -59,7 +59,8 @@
Verifier verifier = newVerifier( subDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/basedir.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java
index 267c1b2..6bcd09d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java
@@ -57,7 +57,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng0761" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/repo/org/apache/maven/its/mng0761/test/1.0-SNAPSHOT/test-1.0-*.jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
index b651053..f26b144 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
@@ -130,7 +130,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", props );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
+ verifier.execute();
verifier.verifyFilePresent( "target/compile.txt" );
verifier.verifyErrorFreeLog();
}
@@ -146,7 +147,8 @@
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.setLogFileName( "log2.txt" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
+ verifier.execute();
verifier.verifyFilePresent( "target/compile.txt" );
verifier.verifyErrorFreeLog();
}
@@ -166,7 +168,8 @@
verifier.setLogFileName( "log3.txt" );
try
{
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build did not fail to resolve missing dependency although Maven ought to work offline!" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java
index 9f54106..9eca46b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java
@@ -55,7 +55,8 @@
verifier.setAutoclean( false );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java
index edfdf22..f5ea72b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "process-resources" );
+ verifier.addCliArgument( "process-resources" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/exec-level.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java
index 2a42d32..bdd033a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java
@@ -58,7 +58,8 @@
verifier.deleteDirectory( "sub2/target" );
verifier.addCliArgument( "-Dexpression.outputFile=target/expression.properties" );
verifier.addCliArgument( "-Dactivate=anything" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
+ verifier.execute();
verifier.verifyFilePresent( "sub1/target/expression.properties" );
verifier.verifyFilePresent( "sub2/target/expression.properties" );
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java
index 45b3939..7d23f51 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java
@@ -57,7 +57,8 @@
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-P" );
verifier.addCliOption( "test-profile" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/profile.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java
index 9a8d23a..729448e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java
@@ -60,7 +60,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Collection<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java
index 320ae88..3431f1c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java
@@ -59,7 +59,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Collection<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java
index 7552c37..9f43785 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java
@@ -56,9 +56,9 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- List<String> goals = Arrays.asList( new String[]{"org.apache.maven.its.plugins:maven-it-plugin-context-passing:throw",
- "org.apache.maven.its.plugins:maven-it-plugin-context-passing:catch"} );
- verifier.executeGoals( goals );
+ verifier.addCliArguments( "org.apache.maven.its.plugins:maven-it-plugin-context-passing:throw",
+ "org.apache.maven.its.plugins:maven-it-plugin-context-passing:catch" );
+ verifier.execute();
verifier.verifyFilePresent( "target/thrown-value" );
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java
index 7f8e239..375af8a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java
@@ -61,7 +61,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setMavenDebug( true );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
String log = FileUtils.fileRead( new File( verifier.getBasedir(), verifier.getLogFileName() ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java
index b196067..29f3ed8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java
@@ -64,14 +64,16 @@
// Maven 3.x aims to separate plugins and project dependencies (MNG-4191)
if ( matchesVersionRange( "(,3.0-alpha-1),(3.0-alpha-1,3.0-alpha-7)" ) )
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
else
{
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Plugin parent POM was erroneously resolved from non-plugin repository." );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java
index 06148b4..4571665 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java
@@ -57,7 +57,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.addCliArgument( "-Dconfig.aliasDefaultExpressionParam=PASSED" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties configProps = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java
index 4e55755..0ec4e5d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java
@@ -57,7 +57,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties configProps = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java
index 9c4afb4..803e9c6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java
@@ -60,7 +60,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "project/target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java
index d4a6c66..0b1e2d3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java
@@ -62,7 +62,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java
index 9b0c980..403a167 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java
@@ -58,7 +58,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties apiProps = verifier.loadProperties( "target/component.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java
index 6548905..c23fe5c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyFileNotPresent( "target/unexpected.txt" );
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
index 587625f..b6ea234 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
@@ -55,7 +55,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "repo" );
verifier.deleteArtifacts( "org.apache.maven.its.mng1021" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1021", "test", "1-SNAPSHOT", "pom" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java
index 92db8b7..f695515 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "process-resources" );
+ verifier.addCliArgument( "process-resources" );
+ verifier.execute();
verifier.verifyFilePresent( "target/plugin-management.txt" );
verifier.verifyFileNotPresent( "target/resources-resources.txt" );
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java
index 02477ef..219080b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java
@@ -60,7 +60,8 @@
verifier.deleteDirectory( "sub-1/target" );
verifier.deleteDirectory( "sub-2/target" );
verifier.setLogFileName( "log-lifecycle.txt" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-fork:2.1-SNAPSHOT:fork-lifecycle-aggregator" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-fork:2.1-SNAPSHOT:fork-lifecycle-aggregator" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/forked/touch.txt" );
@@ -85,7 +86,8 @@
verifier.deleteDirectory( "sub-1/target" );
verifier.deleteDirectory( "sub-2/target" );
verifier.setLogFileName( "log-goal.txt" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-fork:2.1-SNAPSHOT:fork-goal-aggregator" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-fork:2.1-SNAPSHOT:fork-goal-aggregator" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java
index 57430ae..c7a6ebc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java
@@ -62,7 +62,8 @@
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
// NOTE: It's essential part of the test to invoke a phase before "compile"
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "client/target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java
index 30d7315..db06fca 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java
@@ -79,7 +79,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java
index 9d0b582..3920bb4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java
@@ -55,7 +55,7 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoals( Collections.<String> emptyList() );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/clean-clean.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java
index 8cd8a39..9991dfc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java
@@ -59,7 +59,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Collection<String> compileArtifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java
index d93d594..0abc68e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java
@@ -64,7 +64,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties pclProps;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java
index a197dec..8ea3fec 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java
@@ -58,7 +58,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1349", "md5-a", "0.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java
index 3d7f666..542a0dd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java
@@ -56,7 +56,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compileArtifacts = verifier.loadLines( "target/compile-artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java
index 4ae1220..82a95bd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java
@@ -55,7 +55,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-Dtest.property=Test Property" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/cli.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java
index 91f0857..15d1715 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java
@@ -52,7 +52,8 @@
try
{
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java
index 3cf932a..c669993 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java
@@ -48,7 +48,8 @@
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
/*
* This is the simplest way to check a build
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java
index 2d61b92..472d42f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
try {
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
}
catch ( VerificationException e )
{
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java
index d055ce5..5774c78 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java
@@ -61,7 +61,8 @@
verifier.addCliOption( "settings.xml" );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng1703" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java
index 98cfa1d..f5c7421 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java
@@ -65,7 +65,8 @@
Verifier verifier = newVerifier( new File( testDir, "dep" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng1751" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// phase 2: resolve snapshot, if the previous deployment didn't update the metadata, we get the wrong file
@@ -75,7 +76,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties checksums = verifier.loadProperties( "target/checksum.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java
index 71712df..b4eb67e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java
@@ -56,7 +56,8 @@
verifier.setAutoclean( false );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
}
catch ( Exception e )
{
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java
index 4926634..e15df20 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java
@@ -61,7 +61,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
@@ -246,7 +247,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", props );
verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", props );
verifier.setLogFileName( "log-" + scopeB + "-vs-" + scopeA + ".txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
return verifier;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java
index 2f86130..affd57f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/jdk.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java
index 31ff1ce..9bec893 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java
@@ -59,7 +59,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getSystemProperties().setProperty( "config.stringParam", "PASSED" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties configProps = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java
index a946d9b..ad5f11f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/expression.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java
index 0fcda61..60e906f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java
@@ -57,7 +57,8 @@
Verifier verifier = newVerifier( new File( testDir, "child" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java
index be85759..57d16eb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java
@@ -55,7 +55,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "test-user/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng2045" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compile = verifier.loadLines( "test-user/target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java
index afab3b9..011cbd4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java
@@ -56,7 +56,8 @@
verifier.setAutoclean( false );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java
index d8a880b..7f8b680 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "project/project-level2/project-level3/project-jar/target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> executions =
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java
index 666074a..20e18c5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java
@@ -60,7 +60,8 @@
Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng2068" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -79,7 +80,8 @@
Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng2068" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -98,7 +100,8 @@
Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng2068" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java
index b8ed25a..71158f4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java
@@ -60,7 +60,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng2098", "dep", "0.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java
index 4833840..05c07f5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java
@@ -57,7 +57,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "child-1/target" );
verifier.deleteDirectory( "child-2/target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> execs = verifier.loadLines( "child-1/target/log.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java
index eb86785..adc63a4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java
@@ -52,7 +52,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java
index 9b78bb6..e193013 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java
@@ -53,7 +53,8 @@
Verifier verifier = newVerifier( child.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/parent.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java
index e94124e..ccc7763 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java
@@ -52,7 +52,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.mng2130" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java
index d901b31..d0f5f90 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java
@@ -56,7 +56,8 @@
verifier.deleteDirectory( "plugin/target" );
verifier.deleteDirectory( "project/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng2135" );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "project/target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
index ba67e98..b95e52e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
@@ -60,7 +60,8 @@
verifier.addCliArgument( "-Dexpression.expressions=project/properties" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/expression.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java
index db58efa..8d9eff9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "project/target/test.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java
index d0a3bf5..95f8d68 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java
@@ -61,7 +61,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pcl.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
index b8acabb..0c89af1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
@@ -58,14 +58,16 @@
if ( matchesVersionRange( "(,3.0-alpha-1)" ) )
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
else
{
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build should have failed due to bad relativePath" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
index a1a87d8..9073f5d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
@@ -48,7 +48,8 @@
verifier.addCliOption( "-U" );
verifier.setAutoclean( false );
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// All Maven versions not supporting remote parent version ranges will log a warning message whenever
@@ -68,12 +69,11 @@
File testDir = ResourceExtractor.simpleExtractResources(
getClass(), "/mng-2199-parent-version-range/valid-exclusive-upper-bound" );
-
verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.addCliOption( "-U" );
verifier.setAutoclean( false );
-
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// All Maven versions not supporting remote parent version ranges will log a warning message whenever
@@ -96,7 +96,8 @@
verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.setAutoclean( false );
verifier.addCliOption( "-U" );
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
fail( "Expected 'VerificationException' not thrown." );
}
catch ( final VerificationException e )
@@ -122,7 +123,8 @@
verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.setAutoclean( false );
verifier.addCliOption( "-U" );
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
fail( "Expected 'VerificationException' not thrown." );
}
catch ( final VerificationException e )
@@ -147,7 +149,8 @@
verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.setAutoclean( false );
verifier.addCliOption( "-U" );
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
fail( "Expected 'VerificationException' not thrown." );
}
catch ( final VerificationException e )
@@ -168,9 +171,9 @@
File testDir = ResourceExtractor.simpleExtractResources(
getClass(), "/mng-2199-parent-version-range/valid-local/child" );
-
verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// All Maven versions not supporting remote parent version ranges will log a warning message whenever
@@ -196,7 +199,8 @@
try
{
verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
fail( "Expected 'VerificationException' not thrown." );
}
catch ( final VerificationException e )
@@ -219,7 +223,8 @@
getClass(), "/mng-2199-parent-version-range/local-fallback-to-remote/child" );
verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// All Maven versions not supporting remote parent version ranges will log a warning message whenever
@@ -244,7 +249,8 @@
try
{
verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
fail( "Expected 'VerificationException' not thrown." );
}
catch ( final VerificationException e )
@@ -268,7 +274,8 @@
try
{
verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
fail( "Expected 'VerificationException' not thrown." );
}
catch ( final VerificationException e )
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
index 2d459f9..bbf1690 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java
index faa50f2..1e4b541 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java
@@ -59,7 +59,8 @@
verifier.deleteDirectory( "mod-a/target" );
verifier.deleteDirectory( "mod-b/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng2222" );
- verifier.executeGoal( "compile" );
+ verifier.addCliArgument( "compile" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath = verifier.loadLines( "mod-b/target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java
index 2c5d7b0..33d8842 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java
@@ -60,7 +60,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties apiProps = verifier.loadProperties( "target/api.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java
index f60b3fb..82e477d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java
@@ -56,7 +56,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java
index 95bfc15..f7377b7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java
@@ -58,7 +58,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "utf-8/target" );
verifier.deleteDirectory( "latin-1/target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties utf8 = verifier.loadProperties( "utf-8/target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java
index a96d398..6e2049c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java
@@ -58,7 +58,8 @@
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.setLogFileName( "log-1.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/profile.properties" );
@@ -84,7 +85,8 @@
verifier.addCliOption( "settings.xml" );
verifier.addCliOption( "-DsettingsProperty=cli" );
verifier.setLogFileName( "log-2.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/profile.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java
index 83c35a0..fdb2c16 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java
@@ -50,7 +50,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng2277" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-all:aggregator-dependencies" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-all:aggregator-dependencies" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java
index ace5906..952b639 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/param.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java
index 22f5633..dd61069 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java
@@ -114,7 +114,8 @@
verifier.setEnvironmentVariable( "MAVEN_OPTS", "-Djavax.net.ssl.trustStore=" + storePath + " -Djavax.net.ssl.trustStorePassword=" + storePwd );
// disable concurrent downloading as not all wagons (e.g. wagon-lightweight-http) are thread-safe regarding proxy settings
verifier.addCliArgument( "-Dmaven.artifact.threads=1" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
finally
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java
index bf45fd1..8a16fa6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java
@@ -70,7 +70,8 @@
+ ",profiles-a,profiles-b,profiles-e,profiles-c,profiles-d"
+ ",settings-a,settings-b,settings-e,settings-c,settings-d" );
}
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java
index e8f9a4a..644aedd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java
@@ -53,7 +53,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java
index 00c8ae8..89ea8b5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java
@@ -49,7 +49,8 @@
verifier.setAutoclean( false );
verifier.addCliOption( "-Dversion=foo" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -69,7 +70,8 @@
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log-pom-specified.txt" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
assertTrue( "Touchfile using ${project.version} for ${version} does not exist.",
new File( testDir, "target/touch-1.txt" ).exists() );
@@ -82,7 +84,8 @@
verifier.addCliOption( "-Dversion=2" );
verifier.setLogFileName( "log-cli-specified.txt" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java
index d5c857f..3676b52 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java
@@ -58,7 +58,8 @@
verifier.deleteDirectory( "utf-8/target" );
verifier.deleteDirectory( "latin-1/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng2362" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
File pomFile;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java
index 482a07e..df46063 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java
@@ -57,7 +57,8 @@
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "sub-a/target" );
verifier.deleteDirectory( "sub-b/target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/parent1.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
index 3513d21..b21a63b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
@@ -136,7 +136,8 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng2387" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng2387", "a", "0.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java
index ad3e1de..d88d35f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java
@@ -61,7 +61,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "it:touch" );
+ verifier.addCliArgument( "it:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "target/touch-settings.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java
index 0b05362..a9f1164 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java
@@ -60,19 +60,22 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng2486" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( new File( testDir, "parent" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( new File( testDir, "dep-b" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( new File( testDir, "test" ).getAbsolutePath() );
@@ -83,7 +86,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> files = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java
index bfa2724..2e45227 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java
@@ -50,7 +50,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Date now = new Date();
@@ -75,7 +76,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Date now = new Date();
@@ -99,7 +101,8 @@
verifier.deleteDirectory( "child-1/target" );
verifier.deleteDirectory( "child-2/target" );
verifier.deleteDirectory( "child-3/target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java
index 252ff0c..bf6de85 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java
@@ -67,7 +67,8 @@
verifier.addCliOption( "-pl" );
verifier.addCliOption( "sub-b" );
verifier.setLogFileName( "log-only.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "target/touch.txt" );
@@ -95,7 +96,8 @@
verifier.addCliOption( "sub-b" );
verifier.addCliOption( "-am" );
verifier.setLogFileName( "log-upstream.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
@@ -123,7 +125,8 @@
verifier.addCliOption( "sub-b" );
verifier.addCliOption( "-amd" );
verifier.setLogFileName( "log-downstream.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "target/touch.txt" );
@@ -152,7 +155,8 @@
verifier.addCliOption( "-am" );
verifier.addCliOption( "-amd" );
verifier.setLogFileName( "log-both.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
@@ -180,7 +184,8 @@
verifier.addCliOption( "-pl" );
verifier.addCliOption( "sub-d" );
verifier.setLogFileName( "log-basedir.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "target/touch.txt" );
@@ -211,7 +216,8 @@
verifier.addCliOption( "-pl" );
verifier.addCliOption( "+sub-d" );
verifier.setLogFileName( "log-basedir-plus.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "target/touch.txt" );
@@ -237,7 +243,8 @@
verifier.addCliOption( "-pl" );
verifier.addCliOption( "org.apache.maven.its.mng2576:sub-b" );
verifier.setLogFileName( "log-id.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "target/touch.txt" );
@@ -267,7 +274,8 @@
verifier.addCliOption( "-pl" );
verifier.addCliOption( ":sub-b" );
verifier.setLogFileName( "log-artifact-id.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "target/touch.txt" );
@@ -294,7 +302,8 @@
verifier.addCliOption( "-rf" );
verifier.addCliOption( "sub-b" );
verifier.setLogFileName( "log-resume.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java
index 007e259..d5c8d05 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java
@@ -59,7 +59,8 @@
verifier.addCliOption( "settings-env.xml" );
verifier.setEnvironmentVariable( "MNGIT", "env-var-test" );
verifier.setLogFileName( "log-env.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/settings.properties" );
@@ -86,7 +87,8 @@
verifier.addCliOption( "settings-sys.xml" );
verifier.addCliArgument( "-Dusr.MNGIT=usr-prop-test" );
verifier.setLogFileName( "log-sys.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/settings.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
index d6f9ece..83f7d53 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
@@ -75,7 +75,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "subproject/target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "subproject/target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java
index 03d7298..de80496 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java
@@ -59,7 +59,8 @@
verifier.deleteDirectory( "target" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/profile.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java
index 60b447e..c9fc5a3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java
@@ -49,7 +49,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng2668" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng2668", "project", "1.0-SNAPSHOT", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java
index 064cdb8..47058ac 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java
@@ -59,7 +59,8 @@
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
fail( "should throw an error during execution." );
}
@@ -88,7 +89,8 @@
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
fail( "should throw an error during execution." );
}
@@ -117,7 +119,8 @@
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
fail( "should throw an error during execution." );
}
@@ -146,7 +149,8 @@
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
fail( "should throw an error during execution." );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java
index bd1feff..ee5004b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "pre-site" );
+ verifier.addCliArgument( "pre-site" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java
index 378b9d2..f3293fc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java
@@ -64,7 +64,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyFilePresent( "target/a.txt" );
verifier.verifyFilePresent( "target/b.txt" );
verifier.verifyErrorFreeLog();
@@ -79,7 +80,8 @@
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.addCliOption( "--offline" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyFilePresent( "target/a.txt" );
verifier.verifyFilePresent( "target/b.txt" );
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java
index 2033af4..3dca206 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java
@@ -59,7 +59,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "child2/target" );
verifier.deleteDirectory( "child3/target" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classPath;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java
index 270b1a3..9d98b4b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java
@@ -56,7 +56,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-Pe" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java
index 9146362..d532a07 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java
@@ -56,7 +56,8 @@
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
fail(
"POM should NOT validate: repository <id/> element is missing in: " + new File( testDir, "pom.xml" ) );
@@ -96,7 +97,8 @@
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
fail(
"POM should NOT validate: repository <url/> element is missing in: " + new File( testDir, "pom.xml" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java
index 2c0b038..ea894e3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java
@@ -78,7 +78,8 @@
verifier.addCliOption( "settings.xml" );
try
{
- verifier.executeGoal( goal );
+ verifier.addCliArgument( goal );
+ verifier.execute();
fail( "Build should have failed to resolve plugin prefix" );
}
catch ( VerificationException e )
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java
index bf32f52..695f0a0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java
@@ -58,7 +58,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng2744", "a", "1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java
index e3fe02e..cde10b4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java
@@ -59,7 +59,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java
index 325b0b5..76f446a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java
@@ -53,17 +53,20 @@
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2771/extension" );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2771/plugin" );
verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2771/project" );
verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java
index 9892719..b9eb529 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java
@@ -64,7 +64,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteArtifacts( "org.apache.maven.its.mng2790" );
verifier.setAutoclean( false );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
File metadataArtifactVersionFile =
@@ -89,7 +90,8 @@
*/
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Date artifactVersionLastUpdated2 = getLastUpdated( metadataArtifactVersionFile );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java
index da391ec..10364df 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java
@@ -56,7 +56,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng2820" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
File installed = new File( verifier.getArtifactPath( "org.apache.maven.its.mng2820", "test", "0.1", "pom" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java
index e7ef516..b11ad6e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/test-1.0-it.jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java
index 601342f..1c4bc12 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/project.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java
index 1af4b8b..f90923a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java
@@ -56,7 +56,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setEnvironmentVariable( "MNG2848", "GO" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/profile.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java
index de25ee0..ad80e15 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java
@@ -54,7 +54,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "A/target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java
index 2ef896f..c02cff3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java
@@ -102,7 +102,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng2865", "a", "0.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java
index c8d7fef..00e8490 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "consumer/target" );
- verifier.executeGoal( "compile" );
+ verifier.addCliArgument( "compile" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compileClassPath = verifier.loadLines( "consumer/target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java
index b546391..8e40bc8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java
@@ -61,7 +61,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java
index c4ab48e..b02044a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java
@@ -62,7 +62,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "consumer/target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Collection<String> compileArtifacts = verifier.loadLines( "consumer/target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java
index 6be0f77..74b8285 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java
@@ -73,7 +73,8 @@
verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings-default.xml" );
- verifier.executeGoal( "mng-2926:apache" );
+ verifier.addCliArgument( "mng-2926:apache" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( testDir.getAbsolutePath() );
@@ -83,7 +84,8 @@
verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings-custom.xml" );
- verifier.executeGoal( "mng-2926:custom" );
+ verifier.addCliArgument( "mng-2926:custom" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java
index 68c6731..edb82c7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java
@@ -59,7 +59,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
@@ -90,7 +91,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-class-loader:2.1-SNAPSHOT:load" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-class-loader:2.1-SNAPSHOT:load" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java
index ec101cd..d15e2f8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java
@@ -56,7 +56,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
index 31980ab..1d3545b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
@@ -65,7 +65,8 @@
try
{
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
catch ( VerificationException e )
@@ -100,7 +101,8 @@
verifier.addCliOption( "--fail-never" );
verifier.setLogFileName( "log-fn-mt1.txt" );
verifier.addCliArgument( "-Dmaven.threads.experimental=1" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.execute();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject1/target/touch.txt" );
@@ -132,7 +134,8 @@
verifier.addCliArgument( "-Dmaven.threads.experimental=1" );
try
{
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
catch ( VerificationException e )
@@ -167,7 +170,8 @@
verifier.addCliOption( "--fail-never" );
verifier.setLogFileName( "log-fn-mt2.txt" );
verifier.addCliArgument( "-Dmaven.threads.experimental=2" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.execute();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject1/target/touch.txt" );
@@ -199,7 +203,8 @@
verifier.addCliArgument( "-Dmaven.threads.experimental=2" );
try
{
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
catch ( VerificationException e )
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java
index eee07e0..3922783 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java
@@ -60,7 +60,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties xpp3domProps = verifier.loadProperties( "target/xpp3dom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java
index 851f687..fba68b4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java
@@ -69,7 +69,8 @@
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
fail( "Expected failure to resolve dependency artifact without at least calling 'compile' phase." );
}
catch ( VerificationException e )
@@ -102,7 +103,8 @@
verifier.deleteDirectory( "consumer/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3023" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compileClassPath = verifier.loadLines( "consumer/target/compile.classpath", "UTF-8" );
@@ -137,7 +139,8 @@
verifier.deleteDirectory( "consumer/target" );
verifier.setLogFileName( "log-c-1.txt" );
- verifier.executeGoal( "generate-sources" );
+ verifier.addCliArgument( "generate-sources" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compileClassPath = verifier.loadLines( "consumer/target/compile.classpath", "UTF-8" );
@@ -147,7 +150,8 @@
verifier.deleteDirectory( "dependency/dependency-classes" );
verifier.deleteDirectory( "consumer/target" );
verifier.setLogFileName( "log-c-2.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
compileClassPath = verifier.loadLines( "consumer/target/compile.classpath", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java
index 574bd48..d5d07c5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java
@@ -62,7 +62,8 @@
verifier.deleteArtifact( "org.apache.maven.its.it0121", "B", "1.0", "jar" );
verifier.deleteArtifact( "org.apache.maven.its.it0121", "C", "1.0", "pom" );
verifier.deleteArtifact( "org.apache.maven.its.it0121", "D", "1.0", "jar" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -73,7 +74,8 @@
Verifier verifierOtherDep = newVerifier( testOtherDepDir.getAbsolutePath() );
verifierOtherDep.deleteArtifact( "org.apache.maven.its.it0121", "D", version, "jar" );
verifierOtherDep.deleteArtifact( "org.apache.maven.its.it0121", "D", version, "pom" );
- verifierOtherDep.executeGoal( "install" );
+ verifierOtherDep.addCliArgument( "install" );
+ verifierOtherDep.execute();
verifierOtherDep.verifyErrorFreeLog();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java
index 90bbe8d..27b2a36 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java
@@ -61,7 +61,8 @@
verifier.deleteDirectory( "consumer-c/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3043" );
verifier.setLogFileName( "log-test.txt" );
- verifier.executeGoal( "test" );
+ verifier.addCliArgument( "test" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath;
@@ -117,7 +118,8 @@
verifier.deleteDirectory( "consumer-c/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3043" );
verifier.setLogFileName( "log-package.txt" );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
index b81cd46..94f9cb4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
@@ -66,7 +66,8 @@
"repo-d/org/apache/maven/its/mng3052/direct/0.1-SNAPSHOT/direct-0.1-20090517.133956-1.pom", "UTF-8", filterProps );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3052", "direct", "0.1-SNAPSHOT", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java
index 628b33b..ea161ee 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java
@@ -62,7 +62,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java
index cc66c0c..19886ad 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java
@@ -60,7 +60,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "org.apache.maven.its.mng3099:maven-mng3099-plugin:0.1:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.mng3099:maven-mng3099-plugin:0.1:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/PASSED.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java
index 782fad1..db1f36f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> testClassPath = verifier.loadLines( "target/test-classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java
index e4e39b8..0825b09 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java
@@ -59,7 +59,8 @@
verifier.deleteDirectory( "target" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/profile.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java
index dc1d372..9f23475 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( new File( testDir, "child" ).getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/url.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java
index 8d9289a..ae4da21 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java
@@ -63,7 +63,8 @@
verifier.setLogFileName( "log1.txt" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// phase 2: trigger blacklisting of repo (by invalid URL) and check previously downloaded metadata is still used
@@ -76,7 +77,8 @@
verifier.setLogFileName( "log2.txt" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java
index 3cfaf70..8939410 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java
@@ -61,7 +61,8 @@
verifier.setLogFileName( "stdout.txt" );
new File( testDir, "stdout.txt" ).delete();
new File( testDir, "maven.log" ).delete();
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> stdout = verifier.loadLines( "stdout.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java
index 1b48bbd..9324275 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "compile" );
+ verifier.addCliArgument( "compile" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java
index b1ed386..0b25b33 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java
@@ -57,7 +57,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-Pmng3208" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> order = verifier.loadLines( "target/order.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java
index 9159f14..2774cf1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java
@@ -61,7 +61,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "sub-1/target/touch-1.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
index c19a0b3..c5e74c8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
@@ -57,7 +57,8 @@
verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -80,7 +81,8 @@
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Should fail to build with missing junit version." );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java
index 424ae42..c9dbbb4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java
@@ -54,14 +54,16 @@
verifier = newVerifier( new File( testDir, "parent" ).getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
index 1781405..9ca755f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
@@ -54,7 +54,8 @@
verifier.addCliOption( "-Pprofile3" );
verifier.addCliOption( "-P" );
verifier.addCliOption( "profile4" );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/profile1/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java
index 858694b..8e1cd22 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java
@@ -63,7 +63,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
/*
@@ -75,7 +76,8 @@
verifier.deleteDirectory( "mod-b/target" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "mod-a/target/version-0.1.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java
index f38d2d6..28900d5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java
@@ -55,7 +55,8 @@
verifier.setAutoclean( false );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
fail( "Usage of directory instead of file for system-scoped dependency did not fail dependency resolution" );
}
catch ( VerificationException e )
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java
index a3c8cf9..ede4367 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java
@@ -57,7 +57,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java
index 23b8691..f4079f1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java
@@ -62,7 +62,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyFilePresent( "target/compile.txt" );
verifier.verifyErrorFreeLog();
}
@@ -74,7 +75,8 @@
verifier.addCliOption( "-o" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyFilePresent( "target/compile.txt" );
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java
index dbf34da..46d557b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java
@@ -51,7 +51,8 @@
verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
/*
* This is the simplest way to check a build
@@ -76,7 +77,8 @@
verifier = newVerifier( new File( testDir, "parent" ).getAbsolutePath() );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
/*
* This is the simplest way to check a build
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java
index 3ba6ae2..7f860c1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java
@@ -50,7 +50,8 @@
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.addCliOption( "-Dversion=foo" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
index 5227923..43d7b6c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
@@ -58,14 +58,16 @@
verifier.getSystemProperties().setProperty( "updateReleaseInfo", "true" );
- verifier.executeGoals( Arrays.asList( new String[]{ "clean", "install" } ) );
+ verifier.addCliArguments( "clean", "install" );
+ verifier.execute();
verifier = newVerifier( project.getAbsolutePath() );
verifier.addCliOption( "-s" );
verifier.addCliOption( "\"" + settingsFile.getAbsolutePath() + "\"" );
- verifier.executeGoal( "mng3372:test" );
+ verifier.addCliArgument( "mng3372:test" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -82,7 +84,8 @@
verifier.addCliOption( "-U" );
- verifier.executeGoal( "dependency:tree" );
+ verifier.addCliArgument( "dependency:tree" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
index 4ace11c..a64d0cc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
@@ -63,7 +63,8 @@
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.addCliArgument( "-Dmaven.artifact.threads=16" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
String gid = "org.apache.maven.its.mng3379.";
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java
index 2e238a7..5f2e483 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java
@@ -66,7 +66,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java
index fc5fb50..5763e63 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "process-resources" );
+ verifier.addCliArgument( "process-resources" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/resources-resources.txt" );
@@ -72,7 +73,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "clean" );
+ verifier.addCliArgument( "clean" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/clean-clean.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java
index 0b4b185..2ba6689 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java
@@ -53,7 +53,8 @@
verifier.deleteArtifact( GROUP_ID, "A", "1.0", "jar" );
verifier.deleteArtifact( GROUP_ID, "B", "1.0", "pom" );
verifier.deleteArtifact( GROUP_ID, "B", "1.0", "jar" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
testDir = ResourceExtractor.simpleExtractResources( getClass(), baseDir + "/plugin" );
@@ -65,7 +66,8 @@
verifier.deleteArtifact( GROUP_ID, "A", "3.0", "jar" );
verifier.deleteArtifact( GROUP_ID, "plugin", "1.0", "pom" );
verifier.deleteArtifact( GROUP_ID, "plugin", "1.0", "jar" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
testDir = ResourceExtractor.simpleExtractResources( getClass(), baseDir + "/pluginuser" );
@@ -73,7 +75,8 @@
verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.deleteArtifact( GROUP_ID, "pluginuser", "1.0", "pom" );
verifier.deleteArtifact( GROUP_ID, "pluginuser", "1.0", "jar" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java
index 3317a49..8f59e44 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java
@@ -76,7 +76,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-configuration:2.1-SNAPSHOT:config" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-configuration:2.1-SNAPSHOT:config" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
index 61ae180..a6f1890 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
@@ -106,7 +106,8 @@
verifier.addCliOption( settings.getName() );
verifier.setLogFileName( "log-" + methodName + "-firstBuild.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
@@ -115,7 +116,8 @@
setupDummyDependency( verifier, testDir, true );
verifier.setLogFileName( "log-" + methodName + "-secondBuild.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
@@ -209,7 +211,8 @@
setupDummyDependency( verifier, testDir, true );
verifier.setLogFileName( "log-" + methodName + "-firstBuild.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
@@ -224,7 +227,8 @@
setupDummyDependency( verifier, testDir, false );
verifier.setLogFileName( "log-" + methodName + "-secondBuild.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java
index 258f38f..0860668 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/layout.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java
index 33992e0..803f271 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java
@@ -61,7 +61,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "deploy" );
+ verifier.addCliArgument( "deploy" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
index 0ed77dd..12b26ca 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
@@ -70,7 +70,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3461", "a", "0.1", "jar" );
@@ -144,7 +145,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
finally
@@ -177,7 +179,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3461", "a", "0.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java
index 946533a..1153a4e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java
@@ -63,7 +63,8 @@
try
{
verifier.setLogFileName( "log-1.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build did not fail despite broken checksum of dependency POM." );
}
@@ -76,7 +77,8 @@
try
{
verifier.setLogFileName( "log-2.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build did not fail despite broken checksum of dependency POM." );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
index 7456429..d163af6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
@@ -58,7 +58,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties configProps = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java
index 21e5cdf..e040dbe 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java
@@ -58,7 +58,8 @@
verifier.addCliOption( "settings.xml" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
fail( "Build should have failed to resolve dependency" );
}
catch ( VerificationException e )
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java
index aef3e4b..e391c1f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java
@@ -55,7 +55,8 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng3482" );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
index bbdf453..3794311 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
@@ -49,7 +49,8 @@
verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "deploy" );
+ verifier.addCliArgument( "deploy" );
+ verifier.execute();
verifier.verifyFilePresent( "target/wagon.properties" );
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java
index d81cc02..4bab083 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java
@@ -57,13 +57,15 @@
Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.deleteArtifact( "org.apache.maven.its.mng3498", "mavenit-mng3498-plugin", "1", "pom" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectDir.getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java
index d57c5e2..8bea1e1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java
@@ -51,7 +51,8 @@
verifier = newVerifier( dir.getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
@@ -67,7 +68,8 @@
ResourceExtractor.simpleExtractResources( getClass(), "/mng-3503/mng-3503-xpp3Shading-pu-new" );
Verifier verifier = newVerifier( dir.getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
index 31aed01..280fe93 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
@@ -60,7 +60,8 @@
verifier.deleteArtifacts( GID );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java
index c127e17..12444ef 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java
@@ -57,7 +57,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-Dtest.a= " );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java
index 48e5612..77844be 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java
@@ -52,7 +52,8 @@
verifier.addCliOption( "-X" );
verifier.setAutoclean( false );
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -72,7 +73,8 @@
try
{
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "There is a self-referential property in this build; it should fail." );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java
index e9ce054..2d24299 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java
@@ -49,14 +49,16 @@
File pluginDir = new File( testDir, "plugin" );
Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
File projectDir = new File( testDir, "project" );
verifier = newVerifier( projectDir.getAbsolutePath() );
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java
index cb2d72a..aa62a01 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java
@@ -56,7 +56,8 @@
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log1.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// profile 1 and 2 are active by default
@@ -88,7 +89,8 @@
verifier.addCliOption( "-P" );
verifier.addCliOption( "-profile2" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "target/profile1/touch.txt" );
@@ -111,7 +113,8 @@
verifier.addCliOption( "-P" );
verifier.addCliOption( "!profile2" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "target/profile1/touch.txt" );
@@ -139,7 +142,8 @@
verifier.addCliOption( "-Dprofile3-active-by-property=true" );
verifier.addCliOption( "-P-profile3" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/profile1/touch.txt" );
@@ -170,7 +174,8 @@
verifier.addCliOption( "-Pprofile4" );
verifier.addCliOption( "-P-profile4" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/profile1/touch.txt" );
@@ -200,7 +205,8 @@
// Activate
verifier.addCliOption( "-Pprofile4" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "target/profile1/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java
index f6ffdc3..a483052 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java
@@ -53,7 +53,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java
index fd55a1e..7a0b84f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.addCliOption( "-B" );
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java
index cc80a3f..2b5962a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java
@@ -62,7 +62,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/it.properties" );
@@ -85,7 +86,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getSystemProperties().setProperty( "test.home", testDir.getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pcl.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
index a9c43d4..5457681 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
@@ -168,7 +168,8 @@
* for the JAR/POM of the extension and its dependencies when run against a vanilla repo.
*/
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
String settings = FileUtils.fileRead( new File( testDir, "settings-template.xml" ) );
@@ -186,7 +187,8 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng3599" );
verifier.setLogFileName( "logHttp.txt" );
- verifier.executeGoal( "compile" );
+ verifier.addCliArgument( "compile" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" );
@@ -211,7 +213,8 @@
* for the JAR/POM of the extension and its dependencies when run against a vanilla repo.
*/
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
String settings = FileUtils.fileRead( new File( testDir, "settings-template.xml" ) );
@@ -229,7 +232,8 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng3599" );
verifier.setLogFileName( "logDAV.txt" );
- verifier.executeGoal( "compile" );
+ verifier.addCliArgument( "compile" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
index 2942bfc..ae59e34 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
@@ -51,7 +51,8 @@
new File( testDir, "wagon.properties" ).delete();
verifier.setLogFileName( "log-no-settings.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "wagon.properties" );
@@ -72,7 +73,8 @@
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings-server-defaults.xml" );
verifier.setLogFileName( "log-server-defaults.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "wagon.properties" );
@@ -93,7 +95,8 @@
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings-modes-set.xml" );
verifier.setLogFileName( "log-modes-set.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "wagon.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java
index df0f16c..52a3157 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java
@@ -58,7 +58,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getSystemProperties().setProperty( "test.home", testDir.getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pcl.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java
index fa4288c..a74a40a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( new File( testDir, "child" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java
index 86a83e9..52fdbbd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java
@@ -58,7 +58,8 @@
verifier.addCliOption( "-P" );
verifier.addCliOption( "mng-3641-it-provided-profile" );
verifier.setLogFileName( "log-1.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> logFile = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
@@ -69,7 +70,8 @@
verifier.addCliOption( "-P" );
verifier.addCliOption( "mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p" );
verifier.setLogFileName( "log-2.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
logFile = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
@@ -81,7 +83,8 @@
verifier.addCliOption( "-P" );
verifier.addCliOption( "mng-3641-it-provided-profile,mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p" );
verifier.setLogFileName( "log-3.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
logFile = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
@@ -93,7 +96,8 @@
verifier.addCliOption( "-P" );
verifier.addCliOption( "mng-3641-it-provided-profile-child" );
verifier.setLogFileName( "log-4.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
logFile = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
@@ -104,7 +108,8 @@
verifier.addCliOption( "-P" );
verifier.addCliOption( "mng-3641-it-provided-profile-child" );
verifier.setLogFileName( "log-5.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
logFile = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
@@ -115,7 +120,8 @@
verifier.addCliOption( "-P" );
verifier.addCliOption( "mng-3641-it-provided-profile" );
verifier.setLogFileName( "log-6.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
logFile = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java
index f10feb7..ef88d50 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java
@@ -70,7 +70,8 @@
* recurse. We are only installing the parent pom to
* the local repo here.
*/
- verifier.executeGoal( "process-test-resources" );
+ verifier.addCliArgument( "process-test-resources" );
+ verifier.execute();
/*
* This is the simplest way to check a build
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java
index ae1e582..6935e28 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java
@@ -61,7 +61,8 @@
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Should fail to validate the POM syntax due to missing dependency element inside dependencyManagement section." );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
index 0ca3c5b..573e11b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
@@ -121,7 +121,8 @@
File projectDir = new File( testDir, "test-project" );
Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
@@ -130,7 +131,8 @@
verifier.addCliOption( "-X" );
verifier.setLogFileName( "log-unConfiguredHttp.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
String userAgent = this.userAgent;
@@ -162,7 +164,8 @@
File projectDir = new File( testDir, "test-project" );
Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
@@ -173,7 +176,8 @@
verifier.addCliOption( "-X" );
verifier.setLogFileName( "log-unConfiguredDAV.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
File touchFile = new File( projectDir, "target/touch.txt" );
@@ -205,7 +209,8 @@
File projectDir = new File( testDir, "test-project" );
Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
@@ -218,7 +223,8 @@
verifier.addCliOption( "-X" );
verifier.setLogFileName( "log-configWithoutUserAgent.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
File touchFile = new File( projectDir, "target/touch.txt" );
@@ -250,7 +256,8 @@
File projectDir = new File( testDir, "test-project" );
Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
@@ -263,7 +270,8 @@
verifier.addCliOption( "-X" );
verifier.setLogFileName( "log-configWithUserAgent.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
String userAgent = this.userAgent;
@@ -282,7 +290,8 @@
File projectDir = new File( testDir, "test-project" );
Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
@@ -295,7 +304,8 @@
verifier.addCliOption( "-X" );
verifier.setLogFileName( "log-configWithUserAgent.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
String userAgent = this.userAgent;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java
index 583f8bd..8f2a4e4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java
@@ -62,7 +62,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> cp = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java
index 16cbe71..4d81b55 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "compile" );
+ verifier.addCliArgument( "compile" );
+ verifier.execute();
/*
* This is the simplest way to check a build
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java
index a11d5a0..e6a8b0c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java
@@ -51,7 +51,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/check.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java
index 97ff72b..4f18711 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java
@@ -59,7 +59,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java
index cecc803..adb0447 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java
@@ -50,18 +50,21 @@
File projectDir = new File( testDir, "project" );
Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.setLogFileName( "log-validate.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.setLogFileName( "log-site.txt" );
- verifier.executeGoal( "site" );
+ verifier.addCliArgument( "site" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java
index d3ecf53..9da0c6e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
@@ -69,7 +70,8 @@
verifier = newVerifier( projectsDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java
index 182c22a..d7d3397 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java
@@ -52,12 +52,14 @@
Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectDir.getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java
index 8ae2fe5..b285702 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java
@@ -57,7 +57,8 @@
verifier.setAutoclean( false );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
index f6a1118..d1c6a0b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
@@ -54,14 +54,16 @@
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.setLogFileName( "log-mojo.txt" );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -78,14 +80,16 @@
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.setLogFileName( "log-report.txt" );
- verifier.executeGoal( "site" );
+ verifier.addCliArgument( "site" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java
index 91be6d6..adf26e1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java
@@ -56,12 +56,14 @@
Verifier verifier;
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectsDir.getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
@@ -87,17 +89,16 @@
Verifier verifier;
verifier = newVerifier( pluginsDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectDir.getAbsolutePath() );
- List<String> goals = new ArrayList<>();
- goals.add( "org.apache.maven.its.mng3710:mavenit-mng3710-directInvoke-plugin:1:run" );
- goals.add( "validate" );
+ verifier.addCliArguments( "org.apache.maven.its.mng3710:mavenit-mng3710-directInvoke-plugin:1:run", "validate" );
- verifier.executeGoals( goals );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java
index 54088c2..edc4d64 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java
@@ -68,7 +68,8 @@
verifier.deleteDirectory( "target" );
verifier.addCliOption( "--toolchains" );
verifier.addCliOption( "toolchains.xml" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/toolchains.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java
index b0dbdd9..020a8e0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java
@@ -54,12 +54,14 @@
Verifier verifier;
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectsDir.getAbsolutePath() );
- verifier.executeGoal( "org.apache.maven.its.mng3716:mavenit-mng3716-plugin:1:run" );
+ verifier.addCliArgument( "org.apache.maven.its.mng3716:mavenit-mng3716-plugin:1:run" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java
index c66c48f..15dde96 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java
@@ -58,7 +58,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Pattern pattern = Pattern.compile( ".*step-([0-9])\\.properties.*" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java
index fd44c86..92f7c14 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java
@@ -60,12 +60,14 @@
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectDir.getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java
index ac27d0e..8ba7f56 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java
@@ -55,12 +55,14 @@
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java
index 7234218..93cee3c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java
@@ -69,12 +69,14 @@
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java
index fd7e320..78b42f7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java
@@ -69,7 +69,8 @@
{
verifier.addCliOption( "-Ppom,profiles,settings" );
}
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/profile.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java
index 2072565..2f3f3fb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java
@@ -56,11 +56,13 @@
Verifier verifier;
verifier = newVerifier( v1.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( v2.getAbsolutePath() );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java
index 70f6428..31f1692 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java
@@ -56,12 +56,14 @@
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.setLogFileName( "log-sys.txt" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.setLogFileName( "log-sys.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -79,7 +81,8 @@
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.setLogFileName( "log-cli.txt" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectDir.getAbsolutePath() );
@@ -89,7 +92,8 @@
verifier.addCliOption( "-Dtest.usingCliValue=true" );
verifier.addCliOption( "-Djava.version=cli" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java
index 98cc0df..e8a0eb3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java
@@ -53,7 +53,8 @@
Verifier verifier = newVerifier( testDir.getCanonicalPath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java
index 3f97b20..64d5c8a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java
@@ -62,7 +62,8 @@
{
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "build should fail if settings.xml contains unrecognized elements." );
@@ -74,7 +75,8 @@
}
else
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadLines( verifier.getLogFileName(), null );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java
index 9e5ebe5..2c754ca 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java
@@ -57,7 +57,8 @@
verifier.deleteDirectory( "target" );
verifier.addCliOption( "--toolchains" );
verifier.addCliOption( "toolchains.xml" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/tool.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java
index 05cbe77..3ef69d0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java
@@ -61,7 +61,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java
index 753cb15..d85121b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java
@@ -100,7 +100,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> test = verifier.loadLines( "target/test.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java
index b3771dc..0d856f3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java
index bca5683..62eb617 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java
@@ -60,7 +60,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties wclProps = verifier.loadProperties( "target/wcl.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java
index 9afcdfc..c4e1e49 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java
index 3b6f985..1ca8d2f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java
@@ -57,7 +57,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/model.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java
index 9737e6c..fbb904b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java
@@ -52,7 +52,8 @@
verifier.deleteDirectory( "target" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
fail( "Build should not succeed" );
}
catch ( Exception e )
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java
index 2008dc7..85e5a30 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( new File( testDir, "child" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java
index 4c0e989..d5043cb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java
@@ -60,7 +60,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java
index 8d6a951..faa8dff 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java
@@ -58,7 +58,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java
index 8653dfb..00fd7fb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java
index 51dda81..1ab2fe7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties pomProps = verifier.loadProperties( "target/interpolated.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java
index bf54161..0d3228e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/plugin-config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java
index 94f4186..1999f08 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java
@@ -55,7 +55,8 @@
File child = new File( testDir, "child" );
Verifier verifier = newVerifier( child.getAbsolutePath() );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/interpolated.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java
index 497d1b8..0f2255c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java
@@ -57,7 +57,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/interpolated.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java
index 3e4dbf1..bef9808 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( new File( testDir, "child" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/plugin-config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java
index 71e6326..ef83d4e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java
@@ -53,7 +53,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java
index e51e782..ca5e9d7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/xml.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
index 707d866..7da551a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
@@ -66,7 +66,8 @@
verifier.deleteDirectory( "test-3/sub-parent/child-a/target" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java
index 303872a..6253adb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( new File( testDir, "child" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java
index 7a89c7e..01ce293 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( new File( testDir, "sub" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
@@ -89,7 +90,8 @@
Verifier verifier = newVerifier( new File( testDir, "another-parent/sub" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java
index 73c1848..bdde1ed 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java
@@ -57,7 +57,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/plugin-config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java
index 9011952..1422a17 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java
@@ -61,7 +61,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-Pcoreit" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/dist.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java
index 7206257..837ce12 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java
@@ -58,7 +58,8 @@
verifier.deleteDirectory( "target" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Validation step did not detect missing groupId for dependency" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java
index bd2a0cc..5974e78 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/plugin-config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java
index 03e21c1..3ebf0ca 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java
@@ -57,7 +57,8 @@
Verifier verifier = newVerifier( new File( testDir, "sub" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/plugin-config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java
index a993ad2..3382929 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java
@@ -61,7 +61,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compileClassPath = verifier.loadLines( "target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java
index 2db7f69..2be8c23 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java
@@ -76,7 +76,8 @@
Verifier verifier = newVerifier( new File( testDir, project ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
/*
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java
index 41b652c..c1ccb59 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java
@@ -57,7 +57,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties modelProps = verifier.loadProperties( "target/model.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java
index 6daa34e..b15ef45 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java
@@ -77,7 +77,8 @@
Verifier verifier = newVerifier( new File( testDir, project ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadLines( "target/it.log", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java
index 9f9c4fd..ef13509 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java
@@ -77,7 +77,8 @@
Verifier verifier = newVerifier( new File( testDir, project ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadLines( "target/it.log", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java
index 271c99c..80a45aa 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java
@@ -61,7 +61,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java
index 6e28790..43f807e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java
@@ -59,7 +59,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "repo" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3892" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3892", "test", "1.0", "pom" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java
index aef7676..432767f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java
@@ -60,7 +60,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/extension.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java
index fb86758..996db12 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java
@@ -57,7 +57,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-Pinterpolation-profile" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java
index 6da9628..d01f05b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java
@@ -57,7 +57,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java
index 3047628..5523c46 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java
@@ -60,7 +60,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java
index 8a53a0b..090d269 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java
@@ -59,7 +59,8 @@
Verifier verifier = newVerifier( new File( testDir, "sub" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> executions = verifier.loadLines( "target/exec.log", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java
index 8e81e7e..2e7ad6e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java
@@ -57,7 +57,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/xml.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java
index a33c386..a9404ae 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java
@@ -77,7 +77,8 @@
Verifier verifier = newVerifier( new File( new File( testDir, project ), "sub" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadLines( "target/exec.log", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java
index c2ac8c5..745cf7f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "process-resources" );
+ verifier.addCliArgument( "process-resources" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "target/failed.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java
index 35cc2f1..71406c0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java
@@ -77,7 +77,8 @@
Verifier verifier = newVerifier( new File( new File( testDir, project ), "sub" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadLines( "target/exec.log", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java
index 03dcbc1..aa32801 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java
@@ -79,7 +79,8 @@
Verifier verifier = newVerifier( new File( testDir, "sub" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadLines( "target/default.log", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java
index fa0a6cf..064a978 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java
@@ -23,8 +23,6 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
import java.util.Properties;
import org.apache.maven.shared.utils.Os;
@@ -57,24 +55,25 @@
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3940" );
- Map<String, String> envVars = new HashMap<>();
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
/*
* NOTE: The POM is using MAVEN_MNG_3940 to reference the var (just as one would refer to PATH). On Windows,
* this must resolve case-insensitively so we use different character casing for the variable here.
*/
if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
{
- envVars.put( "Maven_mng_3940", "PASSED" );
+ verifier.setEnvironmentVariable( "Maven_mng_3940", "PASSED" );
}
else
{
- envVars.put( "MAVEN_MNG_3940", "PASSED" );
+ verifier.setEnvironmentVariable( "MAVEN_MNG_3940", "PASSED" );
}
- Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate", envVars );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/PASSED.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java
index c19c9ba..6278720 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java
@@ -57,7 +57,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/fork.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java
index 0bb5d6f..d0ea3e2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java
@@ -59,7 +59,8 @@
Verifier verifier = newVerifier( new File( testDir, "sub" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> executions = verifier.loadLines( "target/exec.log", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java
index 7592153..d677069 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java
@@ -58,7 +58,8 @@
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-f" );
verifier.addCliOption( "pom-with-unusual-name.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/basedir.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java
index 2b9d3f9..7d86707 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "org.apache.maven.plugins:maven-resources-plugin:resources" );
+ verifier.addCliArgument( "org.apache.maven.plugins:maven-resources-plugin:resources" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "target/failed.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
index a572997..bec90ff 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
@@ -58,7 +58,8 @@
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3948" );
verifier.filterFile( "pom.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3948", "parent", "0.2", "pom" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java
index 4df0b57..2c66671 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java
@@ -69,7 +69,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/path.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java
index c1c9c83..2d7526b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java
@@ -172,7 +172,8 @@
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.addCliOption( "-DdeploymentPort=" + port );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
assertTrue( deployed );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java
index 0d7033c..2427c14 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java
@@ -60,7 +60,8 @@
verifier.addCliOption( "settings.xml" );
verifier.addCliOption( "--offline" );
verifier.addCliOption( "--batch-mode" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/settings.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java
index 2276219..b1404c3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java
@@ -58,7 +58,8 @@
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3970" );
verifier.filterFile( "pom.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3970", "a", "0.1", "jar" );
@@ -81,7 +82,8 @@
verifier.filterFile( "settings.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3970", "a", "0.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java
index b507151..d519412 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java
@@ -59,7 +59,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3974", "a", "0.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java
index 0bfd106..c389837 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java
@@ -57,7 +57,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java
index 5b2416f..1c95c02 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java
@@ -60,7 +60,8 @@
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3983" );
verifier.filterFile( "pom.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3983", "p", "0.1", "jar" );
@@ -85,7 +86,8 @@
verifier.filterFile( "settings.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3983", "p", "0.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java
index bf85359..c6095e4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java
@@ -58,7 +58,8 @@
verifier.deleteDirectory( "target" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Invalid dependency scope did not cause validation error" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java
index 473ba4e..4fdf1fb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java
@@ -58,7 +58,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> executions = verifier.loadLines( "target/exec.log", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java
index fbe5c08..a36b8da 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java
@@ -58,7 +58,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> executions = verifier.loadLines( "target/exec.log", "UTF-8" );
@@ -81,7 +82,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> executions = verifier.loadLines( "target/exec.log", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java
index a26456f..4713707 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java
@@ -99,7 +99,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
try {
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
}
catch ( VerificationException e )
{
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java
index d675da2..3b27c29 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties modelProps = verifier.loadProperties( "target/model.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java
index 07a7061..211603b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( new File( testDir, "sub" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties modelProps = verifier.loadProperties( "target/model.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java
index 865f910..6c2d2c8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java
@@ -57,7 +57,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-Pparent-profile" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/profile.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java
index e244d69..d3066bd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java
@@ -57,7 +57,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/model.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java
index d63c3c4..b08ab1f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java
@@ -57,7 +57,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-Pmng4022a,mng4022b" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java
index f419180..5c2660b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java
@@ -58,7 +58,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "sub/target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "sub/target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java
index cab2f72..ea08aeb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java
@@ -58,7 +58,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "consumer/target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath1 = verifier.loadLines( "consumer/target/classpath-1.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java
index 8ffc3d4..069d621 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java
@@ -59,7 +59,8 @@
Verifier verifier = newVerifier( new File( testDir, "sub" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java
index 1b3af8d..05f0317 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java
@@ -57,7 +57,8 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4036" );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4036", "parent", "0.2", "pom" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java
index 682767a..c5174db 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( new File( testDir, "sub" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java
index 562e23e..0832068 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java
@@ -56,7 +56,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "sub-2/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4048" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "sub-2/target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java
index 10b2d62..dacc99e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java
index 119addd..c460f66 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java
@@ -88,7 +88,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java
index 4c5a5b2..e23fa25 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java
@@ -57,7 +57,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "consumer/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4056" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "consumer/target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java
index 8210911..3cbf47c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java
@@ -138,7 +138,8 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4068" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4068", "a", "0.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java
index 1a09559..62fec82 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java
@@ -60,7 +60,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java
index 82dc8c5..a5e1c08 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java
@@ -63,7 +63,8 @@
verifier.addCliOption( "settings.xml" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Dependency resolution succeeded although all profiles are inactive" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java
index f81f261..3537785 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java
@@ -56,7 +56,8 @@
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4087" );
verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "target/%72%65%70%6F" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java
index 39ab951..40a13f8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java
@@ -53,7 +53,8 @@
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
fail( "should throw an error during execution." );
}
@@ -88,7 +89,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/plugin-dependency.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java
index 6bb6fa6..22b4681 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java
@@ -79,7 +79,8 @@
Verifier verifier = newVerifier( new File( testDir, "sub" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java
index a9df848..0dc31f6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java
@@ -67,7 +67,8 @@
{
verifier.addCliOption( "-Ppom-a,pom-b,profiles-a,profiles-b,settings-a,settings-b" );
}
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java
index 1140245..e21ffa3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java
@@ -59,7 +59,8 @@
verifier.setAutoclean( false );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java
index 7e75c9f..4fa2d7d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java
@@ -50,7 +50,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java
index b2c9a29..cb0e159 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java
index fa87a65..0f03e50 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java
@@ -60,7 +60,8 @@
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "child-1/target" );
verifier.deleteDirectory( "child-2/target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> executions = verifier.loadLines( "target/executions.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java
index c638289..d0c9a65 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java
@@ -59,7 +59,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Collection<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java
index 417cfd6..bfaebed 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
String p = "project.build.plugins.0.executions.0.configuration.children.";
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java
index 75544af..7bea9cc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java
@@ -62,7 +62,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/class.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java
index 73f4011..766f9f0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java
index 0991f75..d317135 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java
@@ -62,7 +62,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
index 7242257..9fd8b62 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
@@ -59,7 +59,8 @@
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.setLogFileName( "log-1.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties checksums = verifier.loadProperties( "target/checksum.properties" );
@@ -74,7 +75,8 @@
verifier.addCliOption( "-f" );
verifier.addCliOption( "dependent-on-newer-timestamp-pom.xml" );
verifier.setLogFileName( "log-2.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
checksums = verifier.loadProperties( "target/checksum.properties" );
@@ -87,7 +89,8 @@
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.setLogFileName( "log-3.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
checksums = verifier.loadProperties( "target/checksum.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java
index 74f3a84..0949ca2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java
@@ -64,7 +64,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java
index 707510c..7f2cedc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java
@@ -57,7 +57,8 @@
verifier.deleteDirectory( "target" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Duplicate repository ids did not cause validation error" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java
index 631a88a..c7eff12 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java
index 96612b9..b933e57 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java
@@ -69,7 +69,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compileArtifacts = verifier.loadLines( "target/compile-artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java
index eb2c011..a6e9b1a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java
@@ -61,7 +61,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java
index 0302b08..eb7fe55 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java
@@ -57,7 +57,8 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4207" );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java
index d4b491b..3644366 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java
@@ -56,7 +56,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-DtestProperty=PASSED" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java
index 6e80414..05937b5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java
@@ -60,7 +60,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4214", "parent", "0.1", "pom" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java
index ce16f28..65891c6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java
@@ -64,14 +64,16 @@
filterProps.setProperty( "@repo@", "repo-1" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-always-1.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
filterProps.setProperty( "@repo@", "repo-2" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-always-2.txt" );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
@@ -103,14 +105,16 @@
filterProps.setProperty( "@repo@", "repo-1" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-never-1.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
filterProps.setProperty( "@repo@", "repo-2" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-never-2.txt" );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java
index 27ccad9..2a587b0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java
@@ -58,7 +58,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "consumer/target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "consumer/target/artifact.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java
index b5c8419..98b2aeb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java
@@ -154,7 +154,8 @@
verifier.deleteDirectory( "repo" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
assertHash( verifier, "repo/org/apache/maven/its/mng4235/test/0.1/test-0.1.jar", ".sha1", "SHA-1" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
index 68c244b..4789e86 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
@@ -59,7 +59,8 @@
verifier.deleteArtifacts( GID );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java
index 772f302..c47edea 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java
@@ -64,7 +64,8 @@
verifier.addCliOption( "-pl" );
verifier.addCliOption( "." );
verifier.setLogFileName( "log-root.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
@@ -88,7 +89,8 @@
verifier.addCliOption( "-pl" );
verifier.addCliOption( "../sub-a" );
verifier.setLogFileName( "log-module.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java
index 4563f26..f8dd208 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java
@@ -64,7 +64,8 @@
verifier.addCliOption( "-pl" );
verifier.addCliOption( "." );
verifier.setLogFileName( "log-root.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
@@ -88,7 +89,8 @@
verifier.addCliOption( "-pl" );
verifier.addCliOption( "../sub-a" );
verifier.setLogFileName( "log-module.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java
index fc04003..8cf6478 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java
@@ -64,7 +64,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
// This should use the previous installation/deployment from the repo, not the invalid output directory
- verifier.executeGoal( "org.apache.maven.its.mng4269:maven-mng4269-plugin:0.1:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.mng4269:maven-mng4269-plugin:0.1:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java
index ee8e209..8f445c7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java
@@ -61,7 +61,8 @@
verifier.deleteArtifacts( GID );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java
index 7c97e4a..f1ec399 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java
@@ -57,7 +57,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/class.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java
index 61cccd0..961e135 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java
@@ -64,7 +64,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/class.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java
index 4e6de5a..fa43e04 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java
@@ -59,7 +59,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadFile( new File( testDir, verifier.getLogFileName() ), false );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java
index 7573d76..c3d4c29 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java
@@ -62,7 +62,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/class.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java
index cce2852..1dae5e8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java
@@ -57,7 +57,8 @@
Verifier verifier = newVerifier( new File( testDir, "dependency" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng4281" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4281", "dependency", "0.1-SNAPSHOT", "jar" );
@@ -68,7 +69,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties checksums = verifier.loadProperties( "target/checksum.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java
index f65aa60..96b5ff7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java
@@ -56,7 +56,8 @@
verifier.setAutoclean( false );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Invalid packaging of parent POM did not fail the build." );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java
index 1e761d3..db02d00 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java
@@ -60,7 +60,8 @@
verifier.addCliOption( "--offline" );
try
{
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-online:2.1-SNAPSHOT:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-online:2.1-SNAPSHOT:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Request to execute online mojo during offline mode did not fail the build." );
}
@@ -87,7 +88,8 @@
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log-lifecycle.txt" );
verifier.addCliOption( "--offline" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java
index b13737f..0a41c74 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java
index 4e44b0b..3fbb40c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java
@@ -66,7 +66,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compileClassPath = verifier.loadLines( "target/compile-cp.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java
index 1aa51fd..4c8d6f7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java
index f4dc5bd..95e4c96 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/basedir.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java
index 7fa8b62..249f3cc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java
@@ -62,7 +62,8 @@
verifier.addCliOption( "--strict-checksums" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Checksum mismatch for metadata did not fail the build despite strict mode" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java
index 5c5c8a1..8481dd5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java
@@ -57,7 +57,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java
index 537727b..8a79e60 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java
@@ -58,8 +58,9 @@
verifier.deleteDirectory( "consumer/target" );
verifier.deleteDirectory( "dependency/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4314" );
- verifier.executeGoals( Arrays.asList( new String[] { "validate",
- "org.apache.maven.its.plugins:maven-it-plugin-all:2.1-SNAPSHOT:aggregator-dependencies" } ) );
+ verifier.addCliArguments( "validate",
+ "org.apache.maven.its.plugins:maven-it-plugin-all:2.1-SNAPSHOT:aggregator-dependencies" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java
index 8f8a79e..c110680 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java
@@ -59,7 +59,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "org.apache.maven.its.mng4317:maven-mng4317-plugin:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.mng4317:maven-mng4317-plugin:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java
index aea8695..96d86c7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java
@@ -59,7 +59,8 @@
verifier.deleteDirectory( "sub-1/target" );
verifier.deleteDirectory( "sub-2/target" );
verifier.deleteDirectory( "sub-2/sub-3/target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java
index 86722b4..7999446 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java
index 006e69e..bbe7e46 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java
@@ -60,7 +60,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:aggregate-test" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:aggregate-test" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java
index 6798cda..327d9a1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-log-file:2.1-SNAPSHOT:reset" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-log-file:2.1-SNAPSHOT:reset" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/passed.log" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java
index d3d65cd..cfeb2c1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java
@@ -72,7 +72,8 @@
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng4326" );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
final Deque<String> uris = new ConcurrentLinkedDeque<>();
@@ -160,7 +161,8 @@
verifier.addCliOption( "settings.xml" );
verifier.setLogFileName( "log-daily.txt" );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> cp = verifier.loadLines( "target/classpath.txt", "UTF-8" );
@@ -175,7 +177,8 @@
verifier.addCliOption( "-U" );
verifier.setLogFileName( "log-force.txt" );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
cp = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java
index 4a460e2..5e28bf6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "generate-sources" );
+ verifier.addCliArgument( "generate-sources" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> log = verifier.loadLines( "target/fork-lifecycle.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java
index b980914..51a2923 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java
@@ -58,7 +58,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.addCliOption( "--offline" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java
index 42891d2..9cbd9ca 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java
@@ -59,7 +59,8 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4331" );
verifier.deleteDirectory( "sub-2/target" );
verifier.setLogFileName( "log-lifecycle.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "sub-2/target/compile.txt", "UTF-8" );
@@ -85,7 +86,8 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4331" );
verifier.addCliOption( "-Ddepres.projectArtifacts=target/@artifactId@.txt" );
verifier.setLogFileName( "log-aggregator.txt" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-collection:2.1-SNAPSHOT:aggregate-test" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-dependency-collection:2.1-SNAPSHOT:aggregate-test" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "target/sub-2.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java
index 07199e2..700a839 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java
@@ -58,7 +58,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "process-resources" );
+ verifier.addCliArgument( "process-resources" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadLines( "target/resources-resources.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java
index fa686c6..06c1c35 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java
@@ -61,7 +61,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build did not fail to resolve missing dependency although Maven ought to work offline!" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java
index b191a12..299561e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java
index e1f9e19..dbf5d40 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java
@@ -57,7 +57,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadLines( "target/log.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java
index 70aa597..0e6c2e6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props1 = verifier.loadProperties( "target/config1.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java
index e42d1f4..543f14c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java
@@ -166,7 +166,8 @@
verifier.setLogFileName( "log-always-1.txt" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build succeeded despite missing dependency" );
}
@@ -182,7 +183,8 @@
blockAccess = false;
verifier.setLogFileName( "log-always-2.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
assertTrue( requestedUris.toString(), requestedUris.contains( "/dep/0.1/dep-0.1.jar" ) );
@@ -220,7 +222,8 @@
verifier.setLogFileName( "log-never-1.txt" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build succeeded despite missing dependency" );
}
@@ -238,7 +241,8 @@
verifier.setLogFileName( "log-never-2.txt" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Remote repository was accessed despite updatePolicy=never" );
}
@@ -254,7 +258,8 @@
verifier.setLogFileName( "log-never-3.txt" );
verifier.addCliOption( "-U" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
assertTrue( requestedUris.contains( "/dep/0.1/dep-0.1.jar" ) );
@@ -266,7 +271,8 @@
verifier.setLogFileName( "log-never-4.txt" );
verifier.addCliOption( "-U" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
//noinspection unchecked
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java
index 3711223..53cec9e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java
@@ -58,7 +58,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "process-resources" );
+ verifier.addCliArgument( "process-resources" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadLines( "target/log.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java
index d8313e1..5472854 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java
@@ -58,7 +58,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "process-resources" );
+ verifier.addCliArgument( "process-resources" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadLines( "target/log.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java
index 9927d47..e23e71e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java
@@ -65,7 +65,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java
index 258a50c..3167d8e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java
@@ -109,7 +109,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
finally
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java
index 660d0f2..35bdb26 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java
@@ -61,7 +61,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java
index 6657e83..b40cee6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java
@@ -58,7 +58,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "process-resources" );
+ verifier.addCliArgument( "process-resources" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadLines( "target/log.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java
index ad67ab9..4eadfbe 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java
@@ -64,7 +64,8 @@
"UTF-8", filterProps );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/touch.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java
index 80ec8b0..a2dce5a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java
@@ -60,7 +60,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java
index 339d6e6..e152ab2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java
@@ -58,7 +58,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/component.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java
index cd8779e..4ac9869 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java
@@ -63,7 +63,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "mod-a/target/old.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java
index 23b782e..1514805 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java
@@ -58,7 +58,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "mod-c/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4359" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> cp = verifier.loadLines( "mod-c/target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java
index 74cdcbc..282a210 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java
@@ -143,7 +143,8 @@
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
finally
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java
index 323ac1f..5db92e2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java
@@ -64,7 +64,8 @@
filterProps.setProperty( "@repo@", "repo-1" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-force-1.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
assertNull( verifier.loadProperties( "target/checksum.properties" ).getProperty( "b-0.1-SNAPSHOT.jar" ) );
@@ -74,7 +75,8 @@
verifier.setLogFileName( "log-force-2.txt" );
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-U" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java
index 3557a7c..ce633ae 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java
@@ -60,7 +60,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "generate-sources" );
+ verifier.addCliArgument( "generate-sources" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java
index dff712a..024858c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java
@@ -53,7 +53,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java
index c2f05c0..e0664f4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java
@@ -66,7 +66,8 @@
verifier.addCliOption( "settings-a.xml" );
verifier.filterFile( "settings-template.xml", "settings-a.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-a.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4367", "dep", "0.1", "jar" );
@@ -96,7 +97,8 @@
verifier.addCliOption( "settings-b.xml" );
verifier.filterFile( "settings-template.xml", "settings-b.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-b.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4367", "dep", "0.1", "jar" );
@@ -126,7 +128,8 @@
verifier.addCliOption( "settings-c.xml" );
verifier.filterFile( "settings-template.xml", "settings-c.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-c.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4367", "dep", "0.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java
index 3155983..a52e454 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java
@@ -65,7 +65,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4368" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
File installedPom =
@@ -82,7 +83,8 @@
verifier = newVerifier( bDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
pom = FileUtils.fileRead( installedPom, "UTF-8" );
@@ -118,7 +120,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4368" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
File installedArtifact =
@@ -135,7 +138,8 @@
verifier = newVerifier( bDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
data = FileUtils.fileRead( installedArtifact, "UTF-8" );
@@ -150,7 +154,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log-b.txt" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
data = FileUtils.fileRead( installedArtifact, "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java
index ddc7875..100b0d7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java
@@ -59,9 +59,11 @@
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4379" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.setEnvironmentVariable( "MNG_4379_HOME", testDir.getAbsolutePath() );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate", Collections.singletonMap( "MNG_4379_HOME", testDir.getAbsolutePath() ) );
+ verifier.addCliArguments( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java
index 2b97cc3..824ff77 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java
@@ -57,7 +57,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "sub-a/target" );
verifier.deleteDirectory( "sub-b/target" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "sub-b/target/singleton.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java
index 78d3a8a..bca79f2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java
@@ -57,7 +57,8 @@
verifier.deleteDirectory( "target" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Invalid dependency version did not cause validation error" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java
index ca5ac8b..e939160 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java
@@ -57,7 +57,8 @@
verifier.setAutoclean( false );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build leaked lifecycle mapping from extension of first project into second project!" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java
index 7fb6665..4f7d5dd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java
@@ -57,7 +57,8 @@
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-X" );
verifier.setLogFileName( "log.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadLines( "log.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java
index 09676db..7e33e7d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java
@@ -58,7 +58,8 @@
verifier.setAutoclean( false );
verifier.addCliOption( "-q" );
verifier.setLogFileName( "log.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadLines( "log.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java
index 7c1c5d3..618c3af 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java
@@ -58,7 +58,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java
index 41cc657..8488127 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/ant.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java
index 867bd16..50d2ec2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java
@@ -58,7 +58,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties checksums = verifier.loadProperties( "target/checksum.properties" );
@@ -82,7 +83,8 @@
verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties checksums = verifier.loadProperties( "target/checksum.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java
index 57a393a..d068534 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java
@@ -59,7 +59,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/passed.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java
index ff864e3..9c674aa 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java
@@ -58,7 +58,8 @@
verifier.addCliOption( "-N" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Duplicate child module did not cause validation error" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java
index 9e65f99..e88463f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java
@@ -63,7 +63,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java
index f190d14..e684f95 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java
@@ -57,7 +57,8 @@
verifier.deleteDirectory( "target" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Duplicate profile id did not cause validation error" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java
index c9a24b2..8925bf1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java
@@ -57,7 +57,8 @@
verifier.deleteDirectory( "target" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Invalid plugin version did not cause validation error" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java
index 9e48e12..0ce76cc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java
@@ -59,7 +59,8 @@
verifier.addCliOption( "non-existing-settings.xml" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Missing settings file did not cause build error" );
}
@@ -87,7 +88,8 @@
verifier.addCliOption( "non-existing-settings.xml" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Missing settings file did not cause build error" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java
index 78beeb1..cd5da1b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java
@@ -53,7 +53,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.executeGoal( "--help" );
+ verifier.addCliArgument( "--help" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyTextInLog( "--version" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java
index 590feac..571a8ed 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java
@@ -53,7 +53,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.executeGoal( "--version" );
+ verifier.addCliArgument( "--version" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyTextInLog( "Maven" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java
index bf6f2aa..6b0f9f3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java
@@ -65,7 +65,8 @@
verifier.setLogFileName( "log-resolver.txt" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Plugin could resolve artifact from remote repository despite Maven being offline" );
}
@@ -97,7 +98,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.setLogFileName( "log-collector.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactNotPresent( "org.apache.maven.its.mng4412", "dep", "0.1", "pom" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java
index dcb5316..410c6db 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java
@@ -115,7 +115,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4413", "a", "0.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java
index 37d8dd8..ba595f3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java
@@ -60,7 +60,8 @@
Verifier verifier = newVerifier( new File( testDir, "sub" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/it.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java
index 187b2b9..a129f8d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java
@@ -60,7 +60,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/it.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java
index fad1f46..e3fb01d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java
@@ -60,7 +60,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java
index a6d6ef8..40c98c8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java
index f2a46dd..1eb369b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java
@@ -56,7 +56,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.getSystemProperties().setProperty( "mng4423", "PASSED" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
index 1f80c9b..2077983 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
@@ -146,7 +146,8 @@
verifier.addCliOption( "settings.xml" );
verifier.setEnvironmentVariable( "MAVEN_OPTS", "-Djavax.net.ssl.trustStore=" + storePath + " -Djavax.net.ssl.trustStorePassword=" + storePwd );
verifier.setLogFileName( "log-" + getName().substring( 6 ) + ".txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
finally
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java
index ab3887b..f15b5f7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/comp.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java
index d75e9f1..3152f87 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java
@@ -58,7 +58,8 @@
verifier.deleteDirectory( "target" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Distribution management status did not cause validation error" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java
index 4b0649b..e234def 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java
@@ -64,7 +64,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-force-1.txt" );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/old.txt" );
@@ -75,7 +76,8 @@
verifier.setLogFileName( "log-force-2.txt" );
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-U" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java
index 385f742..eb4cb28 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/comp.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java
index 10c1f04..4c6b358 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java
@@ -58,7 +58,8 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4450" );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java
index 37ea186..243c3aa 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java
@@ -62,17 +62,20 @@
verifier.addCliArgument( "-Dmng4452.type=jar" );
verifier.addCliArgument( "-Dmng4452.classifier=unix" );
verifier.setLogFileName( "log-1.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.addCliArgument( "-Dmng4452.type=jar" );
verifier.addCliArgument( "-Dmng4452.classifier=win" );
verifier.setLogFileName( "log-2.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.addCliArgument( "-Dmng4452.type=war" );
verifier.addCliArgument( "-Dmng4452.classifier=win" );
verifier.setLogFileName( "log-3.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( new File( testDir, "consumer" ).getAbsolutePath() );
@@ -82,7 +85,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java
index 8ffebd3..67bc9dd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "process-resources" );
+ verifier.addCliArgument( "process-resources" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/resources-resources.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java
index 089014b..ef5bc7c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java
@@ -60,7 +60,8 @@
new File( testDir, "settings-security.xml" ).getAbsolutePath() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/settings.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java
index 92a4487..1218c81 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyTextInLog( "/target/repo/org/apache/maven/its/mng4461/release/1.0/release-1.0.jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java
index 8d7e203..7373821 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java
@@ -50,7 +50,8 @@
final Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
final List<String> artifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
@@ -65,7 +66,8 @@
final Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
@@ -83,7 +85,8 @@
{
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
fail( "Expected 'VerificationException' not thrown." );
}
catch ( final VerificationException e )
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java
index 11ab447..a14526a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java
@@ -57,7 +57,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "../sub/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4464" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "../sub/target/path.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java
index a0b5737..d062de9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java
@@ -63,7 +63,8 @@
verifier.setLogFileName( "log1.txt" );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "mng4465:touch" );
+ verifier.addCliArgument( "mng4465:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.properties" );
@@ -78,7 +79,8 @@
verifier.setLogFileName( "log2.txt" );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "mng4465:touch" );
+ verifier.addCliArgument( "mng4465:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java
index 688160b..f860f03 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java
@@ -159,7 +159,8 @@
verifier.addCliArgument( "-Dversion=0.1" );
verifier.addCliArgument( "-DrepositoryId=mng4469" );
verifier.addCliArgument( "-DrepositoryUrl=http://localhost:" + port + "/repo" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-artifact:2.1-SNAPSHOT:deploy-file" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-artifact:2.1-SNAPSHOT:deploy-file" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
assertTrue( deployed );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java
index 93fd500..ad98dc0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java
@@ -226,7 +226,8 @@
Collections.singletonMap( "@port@", Integer.toString( port ) ) );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
for ( DeployedResource deployedResource : deployedResources )
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java
index e34c254..e855572 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/wagon.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java
index 5c144ac..774d8f9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java
@@ -61,7 +61,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-parameter-implementation:2.1-SNAPSHOT:param-implementation" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-parameter-implementation:2.1-SNAPSHOT:param-implementation" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/param.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java
index 9321856..f281548 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java
@@ -70,7 +70,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-force-1.txt" );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props1 = verifier.loadProperties( "target/touch.properties" );
@@ -83,7 +84,8 @@
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-X" );
verifier.addCliOption( "-U" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java
index 5c54188..f20d8d5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java
@@ -58,7 +58,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java
index 07ecd0d..b6010f6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java
@@ -115,7 +115,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4489", "ext-dep", "0.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java
index c626912..d62e8fb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java
@@ -59,7 +59,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java
index ba2bd58..7003833 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java
@@ -112,7 +112,8 @@
verifier.addCliOption( "settings.xml" );
verifier.setLogFileName( "log-1.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
@@ -123,7 +124,8 @@
requestedUris.clear();
verifier.setLogFileName( "log-2.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java
index f811e52..b3e1c1b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java
@@ -61,7 +61,8 @@
verifier.addCliOption( "settings.xml" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Missing parent POM of dependency did not fail the build." );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java
index 011707a..4f8d299 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java
@@ -60,7 +60,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "generate-sources" );
+ verifier.addCliArgument( "generate-sources" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java
index 09900ec..6985229 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java
@@ -59,7 +59,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/wagon.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java
index 032e3b1..6e18dc6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java
@@ -56,7 +56,8 @@
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "mod-a/target" );
verifier.deleteDirectory( "mod-b/target" );
- verifier.executeGoal( "generate-sources" );
+ verifier.addCliArgument( "generate-sources" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
assertEquals( 2, verifier.loadLines( "mod-a/target/touch.log", "UTF-8" ).size() );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java
index f4784be..dd89559 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/thread.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java
index b1c26f4..051ad93 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java
@@ -59,7 +59,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java
index 0bdbf1f..f71c3a3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java
@@ -121,7 +121,8 @@
verifier.addCliOption( "settings.xml" );
verifier.setLogFileName( "log-cached-1.txt" );
- verifier.executeGoal( "a:touch" );
+ verifier.addCliArgument( "a:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
@@ -130,7 +131,8 @@
requestedUris.clear();
verifier.setLogFileName( "log-cached-2.txt" );
- verifier.executeGoal( "a:touch" );
+ verifier.addCliArgument( "a:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
assertFalse( requestedUris.toString(), requestedUris.contains( metadataUri ) );
@@ -208,7 +210,8 @@
verifier.addCliOption( "settings.xml" );
verifier.setLogFileName( "log-forced-1.txt" );
- verifier.executeGoal( "a:touch" );
+ verifier.addCliArgument( "a:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
@@ -217,7 +220,8 @@
requestedUris.clear();
verifier.setLogFileName( "log-forced-2.txt" );
- verifier.executeGoal( "a:touch" );
+ verifier.addCliArgument( "a:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
assertTrue( requestedUris.toString(), requestedUris.contains( metadataUri ) );
@@ -298,7 +302,8 @@
FileUtils.copyDirectoryStructure( new File( testDir, "repo-1" ), new File( testDir, "repo-it" ) );
verifier.setLogFileName( "log-refetched-1.txt" );
- verifier.executeGoal( "a:touch" );
+ verifier.addCliArgument( "a:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
@@ -310,7 +315,8 @@
FileUtils.copyDirectoryStructure( new File( testDir, "repo-2" ), new File( testDir, "repo-it" ) );
verifier.setLogFileName( "log-refetched-2.txt" );
- verifier.executeGoal( "b:touch" );
+ verifier.addCliArgument( "b:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
assertTrue( requestedUris.toString(), requestedUris.contains( metadataUri ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java
index b13263e..e11d63d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java
@@ -105,7 +105,8 @@
verifier.addCliOption( "--offline" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
}
catch ( VerificationException e )
{
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java
index 603d124..56b993e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java
@@ -115,7 +115,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4561", "plugin-dep", "0.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java
index 6164551..3939d0a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java
@@ -61,7 +61,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-Dprofile1.on=true" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
//
// The property profile1.on = true so only profile1 should be activated. The profile2.on property is not true so profile2
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java
index 653881f..cb81502 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java
@@ -53,7 +53,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java
index 1283571..66fd480 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java
@@ -58,7 +58,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "sub/target" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-class-loader:load" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-class-loader:load" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties pclProps;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java
index b70fba6..d7055b2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java
@@ -59,7 +59,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "mng4586:touch" );
+ verifier.addCliArgument( "mng4586:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java
index 07b47ea..d3e5c24 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java
@@ -61,7 +61,8 @@
verifier.addCliArgument( "-Dtest.dir=" + testDir.getAbsolutePath() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java
index fa02ecb..ed1d2a2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java
@@ -57,7 +57,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
@@ -84,7 +85,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java
index 7f843b6..cdf1ee1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java
@@ -57,7 +57,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
@@ -83,7 +84,8 @@
verifier.setLogFileName( "log-a.txt" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build did not fail despite required plugin parameter missing" );
}
@@ -111,7 +113,8 @@
verifier.deleteDirectory( "target" );
verifier.addCliArgument( "-Dconfig.requiredParam=CLI" );
verifier.setLogFileName( "log-b.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
@@ -139,7 +142,8 @@
verifier.deleteDirectory( "target" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build did not fail despite required plugin parameter missing" );
}
@@ -165,7 +169,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java
index 60d4896..f1ba996 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> mods = verifier.loadLines( "target/log.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java
index 17fc03c..d7bf8d1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java
@@ -73,7 +73,8 @@
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java
index 282eca4..7a60f75 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java
index e48a337..04753d9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java
@@ -59,7 +59,8 @@
verifier.setAutoclean( false );
verifier.addCliOption( "-T" );
verifier.addCliOption( "2W" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java
index c99399d..1cceeab 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java
@@ -56,7 +56,8 @@
verifier.setAutoclean( false );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Should fail to validate the POM syntax due to misplaced text in <project> element." );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java
index fcb3806..b1bffc5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java
@@ -59,7 +59,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "target/repo/org/apache/maven/its/mng4654/test/1.0/test-1.0.mng4654" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java
index 4380131..7a9f096 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java
@@ -66,7 +66,8 @@
verifier1.deleteDirectory( "target" );
verifier1.deleteArtifacts( "org.apache.maven.its.mng4660" );
- verifier1.executeGoal( "package" );
+ verifier1.addCliArgument( "package" );
+ verifier1.execute();
Path module1Jar = testDir.toPath().resolve( "module-a/target/module-a-1.0.jar" ).toAbsolutePath();
verifier1.verifyErrorFreeLog();
@@ -89,7 +90,8 @@
verifier2.setAutoclean( false );
verifier2.addCliOption( "--projects" );
verifier2.addCliOption( ":module-a" );
- verifier2.executeGoal( "compile" );
+ verifier2.addCliArgument( "compile" );
+ verifier2.execute();
Path module1PropertiesFile = testDir.toPath().resolve( "module-a/target/classes/example.properties" )
.toAbsolutePath();
@@ -109,7 +111,8 @@
verifier3.setAutoclean( false );
verifier3.addCliOption( "--resume-from" );
verifier3.addCliOption( ":module-b" );
- verifier3.executeGoal( "compile" );
+ verifier3.addCliArgument( "compile" );
+ verifier3.execute();
verifier3.verifyErrorFreeLog();
try
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
index a45a6ee..d48833d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
@@ -58,7 +58,8 @@
try
{
- verifier1.executeGoal( "test" ); // The test goal will not create a packaged artifact
+ verifier1.addCliArgument( "test" ); // The test goal will not create a packaged artifact
+ verifier1.execute();
fail( "Expected this invocation to fail" ); // See TestCase.java
}
catch ( final VerificationException ve )
@@ -70,7 +71,8 @@
verifier2.setAutoclean( false );
verifier2.addCliOption( "--resume-from" );
verifier2.addCliOption( ":module-b" );
- verifier2.executeGoal( "compile" ); // to prevent the unit test from failing (again)
+ verifier2.addCliArgument( "compile" );
+ verifier2.execute(); // to prevent the unit test from failing (again)
verifier2.verifyErrorFreeLog();
}
@@ -93,7 +95,8 @@
try
{
- verifier1.executeGoal( "verify" ); // The verify goal will create a packaged artifact
+ verifier1.addCliArgument( "verify" ); // The verify goal will create a packaged artifact
+ verifier1.execute();
fail( "Expected this invocation to fail" ); // See TestCase.java
}
catch ( final VerificationException ve )
@@ -105,7 +108,8 @@
verifier2.setAutoclean( false );
verifier2.addCliOption( "--resume-from" );
verifier2.addCliOption( ":module-b" );
- verifier2.executeGoal( "compile" ); // to prevent the unit test from failing (again)
+ verifier2.addCliArgument( "compile" ); // to prevent the unit test from failing (again)
+ verifier2.execute();
verifier2.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java
index 77b5582..288d661 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java
@@ -80,7 +80,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/type.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java
index 71edfed..12e727f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java
@@ -58,7 +58,8 @@
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "child-1/target" );
verifier.deleteDirectory( "child-2/target" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-log-file:2.1-SNAPSHOT:log-string" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-log-file:2.1-SNAPSHOT:log-string" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> log = verifier.loadLines( "target/log.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java
index e58bce1..31967e6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java
@@ -64,7 +64,8 @@
filterProps.setProperty( "@repo@", "repo-1" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-force-1.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
assertChecksum( verifier, "jar", "2ea5c3d713bbaba7b87746449b91cd00e876703d" );
@@ -75,7 +76,8 @@
verifier.setLogFileName( "log-force-2.txt" );
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-U" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java
index 8261b81..2f72ab8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java
@@ -56,7 +56,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-Pmng4684" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java
index d8afaa0..2142abc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java
@@ -103,7 +103,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java
index 935483c..1ca9061 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java
@@ -61,7 +61,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/artifact.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java
index 2a07cb1..2ec8797 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java
@@ -59,7 +59,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java
index e78ebdc..604d651 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java
@@ -58,7 +58,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pcl.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java
index 1a3c314..a430d50 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java
@@ -115,7 +115,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java
index 65dc984..5266366 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java
@@ -65,11 +65,13 @@
writeMetadata( testDir, "1.0", "20100729123455" );
verifier.setLogFileName( "log-1a.txt" );
- verifier.executeGoal( "org.apache.maven.its.mng4745:maven-it-plugin:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.mng4745:maven-it-plugin:touch" );
+ verifier.execute();
writeMetadata( testDir, "1.1", "20100730123456" );
verifier.setLogFileName( "log-1b.txt" );
- verifier.executeGoal( "org.apache.maven.its.mng4745:maven-it-plugin:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.mng4745:maven-it-plugin:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
@@ -100,11 +102,13 @@
writeMetadata( testDir, "1.0", "20100729123455" );
verifier.setLogFileName( "log-2a.txt" );
- verifier.executeGoal( "org.apache.maven.its.mng4745:maven-it-plugin:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.mng4745:maven-it-plugin:touch" );
+ verifier.execute();
writeMetadata( testDir, "1.1", "20100730123456" );
verifier.setLogFileName( "log-2b.txt" );
- verifier.executeGoal( "org.apache.maven.its.mng4745:maven-it-plugin:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.mng4745:maven-it-plugin:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
@@ -136,11 +140,13 @@
writeMetadata( testDir, "1.0", "20100729123455" );
verifier.setLogFileName( "log-3a.txt" );
- verifier.executeGoal( "org.apache.maven.its.mng4745:maven-it-plugin:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.mng4745:maven-it-plugin:touch" );
+ verifier.execute();
writeMetadata( testDir, "1.1", "20100730123456" );
verifier.setLogFileName( "log-3b.txt" );
- verifier.executeGoal( "org.apache.maven.its.mng4745:maven-it-plugin:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.mng4745:maven-it-plugin:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java
index ee286d0..b34304d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java
@@ -59,7 +59,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setEnvironmentVariable( "MAVEN_OPTS", "-javaagent:agent.jar" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props1 = verifier.loadProperties( "target/agent.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java
index 53b5704..aa1a183 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java
@@ -60,7 +60,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/artifact.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java
index 3cb18d4..8b35d53 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java
@@ -58,7 +58,8 @@
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng4755" );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// test: resolve remote version
@@ -68,7 +69,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> cp = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java
index 8eadf9b..475d028 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java
@@ -64,7 +64,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java
index 1740514..1e1f284 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java
@@ -56,7 +56,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.addCliArgument( "-Duser.prop=OK" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java
index 3a14e4a..96c4f57 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java
@@ -104,7 +104,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java
index 0c1e05b..3cd9414 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java
@@ -102,7 +102,8 @@
verifier.addCliOption( "-U" );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "mng4771:touch" );
+ verifier.addCliArgument( "mng4771:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build should have failed to resolve unknown prefix" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java
index 0ef3bd9..23bffea 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java
@@ -103,7 +103,8 @@
verifier.addCliOption( "-U" );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "org.apache.maven.its.mng4772:maven-it-plugin:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.mng4772:maven-it-plugin:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build should have failed to resolve version for unknown plugin" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java
index d9ba540..ec77519 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java
@@ -58,7 +58,8 @@
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "sub/target" );
verifier.setLogFileName( "log-lifecycle.txt" );
- verifier.executeGoal( "test" );
+ verifier.addCliArgument( "test" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "sub/target/log.txt" );
@@ -82,7 +83,8 @@
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "sub/target" );
verifier.setLogFileName( "log-cli.txt" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-fork:2.1-SNAPSHOT:fork-lifecycle-aggregator" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-fork:2.1-SNAPSHOT:fork-lifecycle-aggregator" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "sub/target/log.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java
index 7ec4665..d41af61 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java
@@ -57,7 +57,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "test/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4779" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath = verifier.loadLines( "test/target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java
index 6231863..8084f3a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java
@@ -138,7 +138,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.addCliOption( "-DdeploymentPort=" + port );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
assertTrue( deployedUris.contains( "/repo/org/apache/maven/its/mng4781/release/1.0/release-1.0.jar" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java
index 54ce412..4000965 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java
@@ -60,7 +60,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/artifacts.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java
index 68f8cc2..8b37c35 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java
@@ -57,7 +57,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/ant.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java
index 0e8e037..2605c29 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/local-repo/test-0.1-SNAPSHOT.jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java
index 9296ea1..428c199 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java
@@ -60,7 +60,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java
index 31fd740..a7d4d34 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java
@@ -60,7 +60,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java
index ab353c2..75fc0a1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java
@@ -57,7 +57,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteDirectory( "sub/target" );
- verifier.executeGoal( "process-sources" );
+ verifier.addCliArgument( "process-sources" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compile0 = verifier.loadLines( "sub/target/compile-0.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java
index 4920696..521a62b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java
@@ -72,7 +72,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java
index 08c8877..a81b094 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java
@@ -53,7 +53,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java
index 3044ed4..e1b4443 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java
@@ -62,10 +62,9 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- List<String> goals = new ArrayList<>();
- goals.add( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:aggregate-test" );
- goals.add( "validate" );
- verifier.executeGoals( goals );
+ verifier.addCliArguments( "validate",
+ "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:aggregate-test" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compile = verifier.loadLines( "consumer/target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java
index 424c29c..a7e7648 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java
@@ -59,7 +59,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadFile( new File( testDir, verifier.getLogFileName() ), false );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java
index c91c34d..2b6e150 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java
@@ -60,7 +60,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java
index dc7868e..1099bcf 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java
@@ -60,7 +60,8 @@
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build did not fail despite unsatisfied prerequisite of plugin on Maven version." );
}
@@ -89,7 +90,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "org.apache.maven.its.mng4840:maven-mng4840-plugin:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.mng4840:maven-mng4840-plugin:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch-1.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java
index 7cc8f75..7cacad3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java
@@ -61,7 +61,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
@@ -90,7 +91,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4842", "parent", "0.1", "pom" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java
index 99a0501..aae05d6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java
@@ -56,7 +56,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "consumer/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4872" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "consumer/target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java
index de14bc5..f55216c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java
@@ -56,7 +56,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4874" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
File metadataFile = new File( testDir, "target/repo/org/apache/maven/its/mng4874/test/maven-metadata.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java
index 473903f..5287fe1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java
@@ -57,7 +57,8 @@
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/wagon.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java
index 4c72f57..d941b78 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java
@@ -60,7 +60,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build did not fail despite over constrained version ranges" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java
index f26039c..70f266e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java
@@ -61,7 +61,8 @@
verifier.addCliOption( "mod-b" );
verifier.addCliOption( "--also-make" );
verifier.setLogFileName( "log-am.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "mod-b/target/touch.txt" );
@@ -90,7 +91,8 @@
verifier.addCliOption( "mod-a" );
verifier.addCliOption( "--also-make-dependents" );
verifier.setLogFileName( "log-amd.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "mod-a/target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java
index 76d0348..c8b34cd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java
@@ -57,13 +57,15 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4891" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( new File( testDir, "consumer" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java
index 9deedc0..1aaed58 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java
@@ -59,7 +59,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/classpath.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java
index 39fd590..e18dce1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java
@@ -60,7 +60,8 @@
verifier.addCliOption( "settings.xml" );
verifier.addCliOption( "-Dmng4913.version=98.76" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java
index 9550926..f269cac 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoals( Arrays.asList( new String[] { "clean", "validate" } ) );
+ verifier.addCliArguments("clean", "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadLines( "target/log.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java
index 7c24dc2..c8de39d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java
@@ -59,7 +59,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java
index 675da17..4322506 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java
@@ -58,7 +58,8 @@
verifier.deleteDirectory( "target" );
verifier.addCliArgument( "-Dmaven.ext.class.path=spy-0.1.jar" );
verifier.addCliOption( "-X" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadLines( "target/spy.log", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java
index e37aa0d..d2f74a2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java
@@ -63,13 +63,15 @@
props.put( "@version@", "1.0" );
verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", props );
verifier.setLogFileName( "log-1.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
props.put( "@version@", "2.0" );
verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", props );
verifier.setLogFileName( "log-2.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java
index ae2158a..11c5975 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java
@@ -57,7 +57,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4955" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( testDir.getAbsolutePath() );
@@ -66,7 +67,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java
index 190244b..5fcc499 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java
@@ -63,7 +63,8 @@
verifier.addCliOption( "--resume-from" );
verifier.addCliOption( "mod-a" );
verifier.setLogFileName( "log-up.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "mod-a/target/touch.txt" );
@@ -94,7 +95,8 @@
verifier.addCliOption( "--resume-from" );
verifier.addCliOption( "mod-b" );
verifier.setLogFileName( "log-down.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "mod-a/target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java
index d66023f..bb46781 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java
@@ -60,7 +60,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java
index 5651613..400f19d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java
@@ -55,7 +55,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java
index 23340e6..abf1004 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java
@@ -61,7 +61,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "sub-b/target/artifact.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java
index 6e389dc..c75b564 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java
@@ -57,7 +57,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-Pprofile2,profile1" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadLines( "target/exec.log", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java
index cac1ede..5da1f19 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java
@@ -60,7 +60,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java
index bef9c1f..903f880 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java
@@ -103,7 +103,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
finally
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java
index d3543c8..a3673bb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java
@@ -53,7 +53,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java
index d10f60f..54bdf29 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java
@@ -58,7 +58,8 @@
Verifier verifier = newVerifier( new File( testDir, "different-from-artifactId" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java
index 9ef9dac..146809a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java
@@ -62,7 +62,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java
index 9849128..36963dd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java
@@ -54,7 +54,8 @@
verifier.deleteDirectory( "target" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build did not fail despite cycle in POM aggregation" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java
index 5fdfcd8..7d136f7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java
@@ -56,7 +56,8 @@
verifier.addCliArgument( "-Dconfig.stringParams=" );
verifier.addCliArgument( "-Dconfig.fileParams=foo,bar" );
verifier.addCliArgument( "-Dconfig.listParam=,two,,four," );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java
index 7b8137d..00e97ec 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java
@@ -54,7 +54,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java
index 47e70a4..0c0e15a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java
@@ -53,7 +53,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java
index 0b76013..34d9815 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java
@@ -58,7 +58,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java
index fa6435d..b0ab45e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java
@@ -115,7 +115,8 @@
verifier.addCliOption( "settings.xml" );
verifier.setLogFileName( "log-1.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
@@ -125,7 +126,8 @@
requestedUris.clear();
verifier.setLogFileName( "log-2.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java
index f0c46e5..07fe586 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java
@@ -61,7 +61,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java
index aa81d7b..6893e56 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java
@@ -59,7 +59,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:aggregate-test" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:aggregate-test" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compile = verifier.loadLines( "target/module.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java
index f628049..e976cfa 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java
@@ -60,8 +60,9 @@
verifier.deleteDirectory( "producer/target" );
verifier.deleteDirectory( "consumer/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng5137" );
- verifier.executeGoal(
+ verifier.addCliArgument(
"org.apache.maven.its.plugins:maven-it-plugin-fork:2.1-SNAPSHOT:fork-lifecycle-aggregator" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> compile = verifier.loadLines( "consumer/target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java
index 381155a..61dbbac 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java
@@ -133,7 +133,8 @@
verifier.addCliOption( "--fail-never" );
verifier.addCliOption( "--errors" );
verifier.setMavenDebug( true );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyTextInLog(
"Could not transfer artifact org.apache.maven.its.mng5175:fake-dependency:pom:1.0-SNAPSHOT" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java
index 2bfeda4..a0e6e27 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java
@@ -57,7 +57,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng5206" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyTextInLog( "MojoWithPlexusLifecycle :: contextualize" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java
index 5ce50d5..de09877 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java
@@ -49,7 +49,8 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5208" );
Verifier spy = newVerifier( testDir.getAbsolutePath() + "/spy");
- spy.executeGoal( "install" );
+ spy.addCliArgument( "install" );
+ spy.execute();
Verifier verifier = newVerifier( testDir.getAbsolutePath() + "/project" );
verifier.setForkJvm( true );
@@ -60,7 +61,8 @@
verifier.addCliOption( "-T" );
verifier.addCliOption( "2" );
verifier.addCliOption( "-fn" );
- verifier.executeGoal( "compile" );
+ verifier.addCliArgument( "compile" );
+ verifier.execute();
verifier.verifyTextInLog( "ProjectFailed/org.apache.maven.its.mng5208:sub-2" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java
index 2569646..9ed98f8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java
@@ -54,7 +54,8 @@
setupVerifier.deleteArtifacts( "org.apache.maven.its.mng5214" );
setupVerifier.setLogFileName( "log-setup.txt" );
setupVerifier.addCliOption( "-PcreateWsdl" );
- setupVerifier.executeGoal( "generate-resources" );
+ setupVerifier.addCliArgument( "generate-resources" );
+ setupVerifier.execute();
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5214" );
@@ -63,7 +64,8 @@
verifier.deleteDirectory( "consumer/target" );
verifier.deleteDirectory( "dependency/target" );
verifier.setLogFileName( "log-test.txt" );
- verifier.executeGoal( "test" );
+ verifier.addCliArgument( "test" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
// RESOLVE-ONE-DEPENDENCY org.apache.maven.its.mng5214:dependency:wsdl:1.0-SNAPSHOT $ /tmp/it
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java
index 05b7c5f..72e2291 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java
@@ -58,7 +58,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log-empty-configuration.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
@@ -109,7 +110,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log-deprecated-property.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
@@ -176,7 +178,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log-deprecated-config.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java
index e6d9c54..75f17c8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java
@@ -62,7 +62,8 @@
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
//verifier.
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
File settingsFile = new File( verifier.getBasedir(), "target/settings-dump.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java
index eb749bc..102144c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java
@@ -67,7 +67,8 @@
verifier.addCliOption( "-pl" );
verifier.addCliOption( "!mod-b" );
verifier.setLogFileName( "log-only.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
@@ -95,7 +96,8 @@
verifier.addCliOption( "mod-b,!mod-a" );
verifier.addCliOption( "-am" );
verifier.setLogFileName( "log-upstream.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
@@ -123,7 +125,8 @@
verifier.addCliOption( "mod-b,!mod-c" );
verifier.addCliOption( "-amd" );
verifier.setLogFileName( "log-downstream.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "target/touch.txt" );
@@ -152,7 +155,8 @@
verifier.addCliOption( "-am" );
verifier.addCliOption( "-amd" );
verifier.setLogFileName( "log-both.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
@@ -180,7 +184,8 @@
verifier.addCliOption( "-pl" );
verifier.addCliOption( "!mod-d" );
verifier.setLogFileName( "log-basedir-exclamation.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
@@ -208,7 +213,8 @@
verifier.addCliOption( "-pl" );
verifier.addCliOption( "-mod-d" );
verifier.setLogFileName( "log-basedir-minus.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
@@ -236,7 +242,8 @@
verifier.addCliOption( "-pl" );
verifier.addCliOption( "!org.apache.maven.its.mng5230:mod-b" );
verifier.setLogFileName( "log-id.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
@@ -263,7 +270,8 @@
verifier.addCliOption( "-pl" );
verifier.addCliOption( "!:mod-b" );
verifier.setLogFileName( "log-artifact-id.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch.txt" );
@@ -292,7 +300,8 @@
verifier.addCliOption( "-pl" );
verifier.addCliOption( "!mod-c" );
verifier.setLogFileName( "log-resume.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java
index 9658aca..32d4b8f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java
@@ -106,7 +106,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
assertTrue( repoHandler.artifactRequestedFromRepo2 );
@@ -142,7 +143,8 @@
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "org.apache.maven.its.mng5280:fake-maven-plugin:1.0:fake" );
+ verifier.addCliArgument( "org.apache.maven.its.mng5280:fake-maven-plugin:1.0:fake" );
+ verifier.execute();
assertTrue( pluginRepoHandler.pluginRequestedFromRepo2 );
assertTrue( pluginRepoHandler.pluginRequestedFromRepo1Last );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java
index fdce5e8..1e32d42 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java
@@ -63,7 +63,8 @@
verifier.addCliOption( "-f" );
verifier.addCliOption( "project" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java
index 4dfc63e..aabb155 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java
@@ -61,7 +61,8 @@
v0.setAutoclean( false );
v0.deleteDirectory( "target" );
v0.deleteArtifacts( "org.apache.maven.its.mng5382" );
- v0.executeGoal( "install" );
+ v0.addCliArgument( "install" );
+ v0.execute();
v0.verifyErrorFreeLog();
//
@@ -69,7 +70,8 @@
//
Verifier v1 = newVerifier( testDir.getAbsolutePath(), "remote" );
v1.setAutoclean( false );
- v1.executeGoal( "org.apache.maven.its.mng5382:jsr330-maven-plugin:0.0.1-SNAPSHOT:hello" );
+ v1.addCliArgument( "org.apache.maven.its.mng5382:jsr330-maven-plugin:0.0.1-SNAPSHOT:hello" );
+ v1.execute();
v1.verifyErrorFreeLog();
v1.verifyTextInLog( "Hello! I am a component that is being used via constructor injection! That's right, I'm a JSR330 badass." );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java
index f6471dd..814b8b4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java
@@ -54,7 +54,8 @@
v0.setAutoclean( false );
v0.deleteDirectory( "target" );
v0.deleteArtifacts( "org.apache.maven.its.mng5387" );
- v0.executeGoal( "install" );
+ v0.addCliArgument( "install" );
+ v0.execute();
v0.verifyErrorFreeLog();
String path = v0.getArtifactPath( "org.apache.maven.its.mng5387", "mng5387-it", "0.0.1-SNAPSHOT", "txt", "c" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java
index 1a6837b..46b67a0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java
@@ -47,12 +47,14 @@
// install the test plugin
verifier = newVerifier( extensionDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// build the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/afterSessionEnd.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java
index 11522c7..739f664 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java
@@ -56,7 +56,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/path1.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java
index 8e0bbdb..f1aac90 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java
@@ -52,7 +52,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java
index 365e3c5..6d92c32 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java
@@ -47,7 +47,8 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5452-maven-build-timestamp-utc" );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "process-resources" );
+ verifier.addCliArgument( "process-resources" );
+ verifier.execute();
//
// We have a timestamp format = yyyyMMdd:HHmm:z, where the final element is the timezone which should be UTC
//
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java
index d975677..c72cfe6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java
@@ -77,7 +77,8 @@
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
fail( "should throw an error during execution." );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java
index 1ae65d6..b95e3fd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java
@@ -57,7 +57,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
index f005f5f..2e2275b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
@@ -46,12 +46,14 @@
// install the test plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// build the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// verifier.verifyFilePresent( "target/execution-failure.txt" );
@@ -71,7 +73,8 @@
// install the test plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// build the test project
@@ -80,7 +83,8 @@
verifier.addCliOption( "multithreaded" );
verifier.addCliOption( "-T" );
verifier.addCliOption( "1" );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// verifier.verifyFilePresent( "target/execution-failure.txt" );
@@ -101,19 +105,22 @@
// install the test extension
verifier = newVerifier( extensionDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// install the test plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// build the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.addCliOption( "-Dmaven.ext.class.path=" + new File( extensionDir, "target/classes" ).getAbsolutePath() );
verifier.setForkJvm( true ); // verifier does not support custom realms in embedded mode
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java
index d990bc1..013eb6a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java
@@ -61,7 +61,8 @@
verifier.addCliOption( "project-0,project-1" );
try
{
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
}
catch ( VerificationException e )
{
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java
index e912c6b..e00416c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java
@@ -49,15 +49,18 @@
Verifier verifier;
verifier = newVerifier( oldPluginWithRelocationDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( newPluginDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectDir.getAbsolutePath() );
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyTextInLog( "[WARNING] Hello from Maven!" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java
index 5fdb52f..5fa45ed 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java
@@ -58,13 +58,15 @@
setup.setAutoclean( true );
setup.addCliOption( "-f" );
setup.addCliOption( "plugin/pom.xml" );
- setup.executeGoal( "install" );
+ setup.addCliArgument( "install" );
+ setup.execute();
setup.verifyErrorFreeLog();
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setLogFileName( "log2.txt" );
verifier.setAutoclean( false );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
if ( getMavenVersion().getMajorVersion() <= 3 )
{
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java
index 3cb64d0..d81b6bf 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java
@@ -58,7 +58,8 @@
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-Dchangelist=changelist" );
verifier.addCliOption( "-Dmaven.experimental.buildconsumer=false" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
@@ -89,7 +90,8 @@
verifier.deleteDirectory( "target" );
verifier.addCliOption( "-Dchangelist=changelist" );
verifier.addCliOption( "-Dmaven.experimental.buildconsumer=true" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java
index d1dd04b..b08184f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java
@@ -46,13 +46,15 @@
// install the test plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// build the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.addCliOption( "-Dit-build-extensions=false" );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -68,7 +70,8 @@
// install the test plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// build the test project
@@ -78,7 +81,8 @@
verifier.addCliOption( "multithreaded" );
verifier.addCliOption( "-T" );
verifier.addCliOption( "1" );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -94,13 +98,15 @@
// install the test plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// build the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.addCliOption( "-Dit-build-extensions=true" );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -117,19 +123,22 @@
// install the test extension
verifier = newVerifier( extensionDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// install the test plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// build the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.addCliOption( "-Dmaven.ext.class.path=" + new File( extensionDir, "target/classes" ).getAbsolutePath() );
verifier.setForkJvm( true ); // verifier does not support custom realms in embedded mode
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
index d8c4666..d284758 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
@@ -56,13 +56,15 @@
// install the test extension
verifier = newVerifier( extensionDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// compile the test project
verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.setLogFileName( "compile-log.txt" );
- verifier.executeGoal( "compile" );
+ verifier.addCliArgument( "compile" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// run custom "test-only" build phase
@@ -71,7 +73,8 @@
verifier.setLogFileName( "test-only-log.txt" );
verifier.setForkJvm( true );
verifier.setMavenDebug( true );
- verifier.executeGoal( "test-only" );
+ verifier.addCliArgument( "test-only" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyTextInLog( "maven-surefire-plugin" );
verifyTextNotInLog( verifier, "maven-compiler-plugin" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java
index e7d3a6d..101fe45 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java
@@ -54,14 +54,16 @@
// install the test extension
verifier = newVerifier( extensionDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// compile the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.addCliOption( "-Dmaven.ext.class.path="
+ new File( extensionDir, "target/mng-5591-workspace-reader-extension-0.1.jar" ).getCanonicalPath() );
- verifier.executeGoal( "compile" );
+ verifier.addCliArgument( "compile" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java
index ca0498c..3916e15 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java
@@ -49,7 +49,8 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5608-profile-activation-warning" );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// check expected profiles activated, just for sanity (or build should have failed, given other profiles)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java
index 4b67946..8bd2804 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java
@@ -52,7 +52,8 @@
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng5639", "b", "0.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java
index cf1fb31..fb1cf71 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java
@@ -57,14 +57,16 @@
// install the test plugin
verifier = newVerifier( extensionDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// build the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
try
{
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
fail( "The build should fail" );
}
catch ( VerificationException e)
@@ -97,14 +99,16 @@
// install the test plugin
verifier = newVerifier( extensionDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// build the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
try
{
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
fail( "The build should fail" );
}
catch ( VerificationException e )
@@ -137,19 +141,22 @@
// install the test plugin
verifier = newVerifier( extensionDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// install the bad plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// build the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
try
{
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
fail( "The build should fail" );
}
catch ( VerificationException e )
@@ -182,19 +189,22 @@
// install the test plugin
verifier = newVerifier( extensionDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// install the bad plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// build the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
try
{
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
fail( "The build should fail" );
}
catch ( VerificationException e )
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java
index 97636d5..27e590f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java
@@ -58,7 +58,8 @@
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng5663", "c", "0.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java
index 81e2ab1..f02ff67 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java
@@ -66,7 +66,8 @@
verifier.addCliOption( "-q" );
verifier.addCliOption( "-U" );
verifier.addCliOption( "-Dmaven.experimental.buildconsumer=false" );
- verifier.executeGoals( Arrays.asList( "verify" ) );
+ verifier.addCliArgument( "verify");
+ verifier.execute();
List<String> logTxt = verifier.loadLines( "log.txt", "utf-8" );
for ( String line : logTxt )
@@ -120,7 +121,8 @@
verifier.addCliOption( "-q" );
verifier.addCliOption( "-U" );
verifier.addCliOption( "-Dmaven.experimental.buildconsumer=true" );
- verifier.executeGoals( Arrays.asList( "verify" ) );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
List<String> logTxt = verifier.loadLines( "log-bc.txt", "utf-8" );
for ( String line : logTxt )
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java
index 2e4ee97..61bf24c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java
@@ -66,7 +66,8 @@
verifier.deleteDirectory( "target" );
verifier.addCliOption( "--toolchains" );
verifier.addCliOption( "toolchains.xml" );
- verifier.executeGoal( "initialize" );
+ verifier.addCliArgument( "initialize" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/toolchains.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java
index e214376..d48ad7a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java
@@ -48,12 +48,14 @@
// install the test plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// build the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/execution-success.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java
index 9d88b9d..875015e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java
@@ -48,7 +48,8 @@
// install the test plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
File configurationFile = new File(projectDir, "configuration.txt");
@@ -56,7 +57,8 @@
// build the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( configurationFile.getCanonicalPath() );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java
index 8833a7a..e50c828 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java
@@ -74,7 +74,8 @@
try
{
- verifier.executeGoal( "test" );
+ verifier.addCliArgument( "test" );
+ verifier.execute();
fail( "Expected this invocation to fail" );
}
catch ( final VerificationException ve )
@@ -86,7 +87,8 @@
// New build with -r should resume the build from module-b, skipping module-a since it has succeeded already.
verifier = newVerifier( parentDependentTestDir.getAbsolutePath() );
verifier.addCliOption( "-r" );
- verifier.executeGoal( "test" );
+ verifier.addCliArgument( "test" );
+ verifier.execute();
verifyTextNotInLog( verifier, "Building module-a 1.0" );
verifier.verifyTextInLog( "Building module-b 1.0" );
verifier.verifyTextInLog( "Building module-c 1.0" );
@@ -101,7 +103,8 @@
try
{
- verifier.executeGoal( "test" );
+ verifier.addCliArgument( "test" );
+ verifier.execute();
fail( "Expected this invocation to fail" );
}
catch ( final VerificationException ve )
@@ -116,8 +119,8 @@
// ... but adding -r should exclude those two from the build because the previous Maven invocation
// marked them as successfully built.
verifier.addCliOption( "-r" );
-
- verifier.executeGoal( "test" );
+ verifier.addCliArgument( "test" );
+ verifier.execute();
}
@Test
@@ -132,7 +135,8 @@
try
{
- verifier.executeGoal( "test" );
+ verifier.addCliArgument( "test" );
+ verifier.execute();
fail( "Expected this invocation to fail" );
}
catch ( final VerificationException ve )
@@ -142,7 +146,8 @@
verifier = newVerifier( parentIndependentTestDir.getAbsolutePath() );
verifier.addCliOption( "-r" );
- verifier.executeGoal( "test" );
+ verifier.addCliArgument( "test" );
+ verifier.execute();
verifier.verifyTextInLog( "Building module-a 1.0" );
verifyTextNotInLog( verifier, "Building module-b 1.0" );
}
@@ -156,7 +161,8 @@
final Verifier verifier = newVerifier( noProjectTestDir.getAbsolutePath() );
try
{
- verifier.executeGoal( "resources:resources" );
+ verifier.addCliArgument( "resources:resources" );
+ verifier.execute();
}
catch ( final VerificationException ve )
{
@@ -184,7 +190,8 @@
verifier.addCliOption( "-Dmodule-c.fail=true" );
try
{
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
fail( "Expected this invocation to fail" );
}
catch ( final VerificationException ve )
@@ -204,7 +211,8 @@
// c : success
// d : success
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
}
@Test
@@ -226,7 +234,8 @@
verifier.addCliOption( "-Dmodule-d.fail=true" );
try
{
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
fail( "Expected this invocation to fail" );
}
catch ( final VerificationException ve )
@@ -246,7 +255,8 @@
// The result should be:
// c : success
// d : success
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
}
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java
index d67c27d..51e6a65 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java
@@ -43,7 +43,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-configuration:config@test-execution-id" );
+ verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-configuration:config@test-execution-id" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
index 4caca1f..4951363 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
@@ -35,7 +35,8 @@
verifier.deleteArtifacts( "org.apache.maven.its.it-core-extensions" );
verifier.addCliOption( "-s" );
verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -53,7 +54,8 @@
verifier.deleteArtifacts( "org.apache.maven.its.it-core-extensions" );
verifier.addCliOption( "-s" );
verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -96,7 +98,8 @@
verifier.deleteArtifacts( "org.apache.maven.its.it-core-extensions" );
verifier.addCliOption( "-s" );
verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
server.stop();
@@ -122,7 +125,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
verifier.addCliOption( "-Dtest-extension-version=0.1" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -146,7 +150,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
verifier.setForkJvm( true ); // force forked JVM since we need the shell script to detect .mvn/
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java
index 18c3e92..aca1b25 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java
@@ -31,7 +31,8 @@
verifier.deleteArtifacts( "org.apache.maven.its.it-configuration-processors" );
verifier.addCliOption( "-s" );
verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
- verifier.executeGoal( "process-resources" );
+ verifier.addCliArgument( "process-resources" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// Making sure our configuration processor executes
verifier.verifyTextInLog( "[INFO] ConfigurationProcessorOne.process()" );
@@ -57,7 +58,8 @@
verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
try
{
- verifier.executeGoal( "process-resources" );
+ verifier.addCliArgument( "process-resources" );
+ verifier.execute();
fail( "We expected this invocation to fail because of too many user supplied configuration processors being present" );
}
catch ( VerificationException e )
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java
index eaf41f4..5f85342 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java
@@ -23,11 +23,13 @@
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5783-plugin-dependency-filtering" );
Verifier verifier = newVerifier( new File( testDir, "plugin" ).getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( new File( testDir, "slf4j" ).getAbsolutePath(), "remote" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// Note that plugin dependencies always include plugin itself and plexus-utils
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java
index 5abf66d..3f67e84 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java
@@ -26,7 +26,8 @@
verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyTextInLog( "CLASS_NAME=org.apache.maven.its.mng5805.TestClass1" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java
index 020354d..6ab892a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java
@@ -22,11 +22,13 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5840-relative-path-range-negative" );
Verifier verifier = newVerifier( new File( testDir, "parent-1" ).getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( new File( testDir, "child" ).getAbsolutePath(), "remote" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -37,11 +39,13 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5840-relative-path-range-positive" );
Verifier verifier = newVerifier( new File( testDir, "parent-1" ).getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( new File( testDir, "child" ).getAbsolutePath(), "remote" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java
index aef2c89..eb314ae 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java
@@ -22,11 +22,13 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5840-relative-path-reactor-matching" );
Verifier verifier = newVerifier( new File( testDir, "parent-1" ).getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( new File( testDir, "child" ).getAbsolutePath(), "remote" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java
index ba8192d..bcabf59 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java
@@ -133,7 +133,8 @@
verifier.addCliOption( "-Dartifact.attachedFile=" + tmp.toFile().getCanonicalPath() );
verifier.addCliOption( "-DdeploymentPort=" + port );
verifier.displayStreamBuffers();
- verifier.executeGoals( Arrays.asList("org.apache.maven.its.plugins:maven-it-plugin-artifact:2.1-SNAPSHOT:attach", "deploy" ) );
+ verifier.addCliArguments( "org.apache.maven.its.plugins:maven-it-plugin-artifact:2.1-SNAPSHOT:attach", "deploy" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
assertEquals("deployedJarArtifactNumber: " + deployedJarArtifactNumber, 1, deployedJarArtifactNumber );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java
index f05b142..4e5777e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java
@@ -113,7 +113,8 @@
verifier.addCliOption( option ); // -f/--file client/pom.xml
verifier.addCliOption( ( pom ? new File( testDir, "pom.xml" ) : testDir ).getAbsolutePath() );
verifier.setForkJvm( true ); // force forked JVM since we need the shell script to detect .mvn/ location
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "expression.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java
index 55a0e40..8c58b1f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java
@@ -66,8 +66,10 @@
//verifier.setLogFileName( "log-only.txt" );
verifier.addCliOption( "-Drevision=1.2" );
verifier.addCliOption( "-Dmaven.experimental.buildconsumer=false" );
- verifier.executeGoal( "clean" );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "clean" );
+ verifier.execute();
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -85,8 +87,10 @@
verifier.setLogFileName( "log-bc.txt" );
verifier.addCliOption( "-Drevision=1.2" );
verifier.addCliOption( "-Dmaven.experimental.buildconsumer=true" );
- verifier.executeGoal( "clean" );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "clean" );
+ verifier.execute();
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java
index 2ce7f63..7abe5eb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java
@@ -53,7 +53,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "test" );
+ verifier.addCliArgument( "test" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java
index 0eaa349..e523cb1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java
@@ -49,7 +49,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> dependencies = verifier.loadLines( "target/dependencies.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java
index 9615cd4..963de36 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java
@@ -24,7 +24,8 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5958-lifecycle-phases/good" );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyTextInLog( "CLASS_NAME=java.lang.String" );
}
@@ -38,7 +39,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
}
catch ( VerificationException e )
{
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java
index 43b34f5..9a37241 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java
@@ -38,7 +38,8 @@
verifier.setLogFileName( "log-only.txt" );
verifier.addCliOption( "-T1" );
// include an aggregator task so that the two goals end up in different task segments
- verifier.executeGoals( Arrays.asList( "clean", "install:help" ) );
+ verifier.addCliArguments( "clean", "install:help" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> logLines = verifier.loadLines( "log-only.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java
index dcb8194..7451de4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java
@@ -63,7 +63,8 @@
verifier.setLogFileName( "log-only.txt" );
verifier.addCliOption( "-Drevision=1.3.0-SNAPSHOT" );
- verifier.executeGoal( "clean" );
+ verifier.addCliArgument( "clean" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> loadedLines = verifier.loadLines( "log-only.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6065FailOnSeverityTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6065FailOnSeverityTest.java
index 0b633d1..40a467b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6065FailOnSeverityTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6065FailOnSeverityTest.java
@@ -58,7 +58,8 @@
try
{
- verifier.executeGoal( "compile" );
+ verifier.addCliArgument( "compile" );
+ verifier.execute();
}
catch ( VerificationException e )
{
@@ -81,7 +82,8 @@
verifier.addCliOption( "--fail-on-severity" );
verifier.addCliOption( "ERROR" );
- verifier.executeGoal( "compile" );
+ verifier.addCliArgument( "compile" );
+ verifier.execute();
verifier.verifyTextInLog( "Enabled to break the build on log level ERROR." );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java
index ed2107d..112a48f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java
@@ -34,7 +34,8 @@
verifier.addCliOption( "-f" );
verifier.addCliOption( "./pom.xml" );
verifier.setForkJvm( true );
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java
index 71da101..8f60538 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java
@@ -59,7 +59,8 @@
v0.setAutoclean( false );
v0.deleteDirectory( "target" );
v0.deleteArtifacts( "org.apache.maven.its.mng6084" );
- v0.executeGoal( "install" );
+ v0.addCliArgument( "install" );
+ v0.execute();
v0.verifyErrorFreeLog();
//
@@ -67,7 +68,8 @@
//
Verifier v1 = newVerifier( testDir.getAbsolutePath(), "remote" );
v1.setAutoclean( false );
- v1.executeGoal( "org.apache.maven.its.mng6084:jsr250-maven-plugin:0.0.1-SNAPSHOT:hello" );
+ v1.addCliArgument( "org.apache.maven.its.mng6084:jsr250-maven-plugin:0.0.1-SNAPSHOT:hello" );
+ v1.execute();
v1.verifyErrorFreeLog();
v1.verifyTextInLog( "Hello! I am a component using JSR 250 with @PostConstruct support" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java
index 03da7f4..48814f6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java
@@ -67,7 +67,8 @@
verifier.addCliOption( "-Drevision=1.2" );
verifier.addCliOption( "-Dmaven.experimental.buildconsumer=false" );
verifier.setLogFileName( "install-log.txt" );
- verifier.executeGoals( Arrays.asList( "clean", "install" ) );
+ verifier.addCliArguments( "clean", "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( testDir.getAbsolutePath(), false );
@@ -77,7 +78,8 @@
verifier.addCliOption( "-Drevision=1.2" );
verifier.addCliOption( "-pl" );
verifier.addCliOption( "module-3" );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -95,7 +97,8 @@
verifier.addCliOption( "-Drevision=1.2" );
verifier.addCliOption( "-Dmaven.experimental.buildconsumer=true" );
verifier.setLogFileName( "install-log.txt" );
- verifier.executeGoals( Arrays.asList( "clean", "install" ) );
+ verifier.addCliArguments( "clean", "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( testDir.getAbsolutePath(), false );
@@ -106,7 +109,8 @@
verifier.addCliOption( "-Drevision=1.2" );
verifier.addCliOption( "-pl" );
verifier.addCliOption( "module-3" );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java
index d801961..a9dce48 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java
@@ -61,13 +61,15 @@
{
// Compile the whole project first.
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "compile" );
+ verifier.addCliArgument( "compile" );
+ verifier.execute();
final File submoduleDirectory = new File( testDir, "app" );
verifier = newVerifier( submoduleDirectory.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.setLogFileName( "log-insubmodule.txt" );
- verifier.executeGoal( "compile" );
+ verifier.addCliArgument( "compile" );
+ verifier.execute();
}
/**
@@ -80,14 +82,16 @@
{
// Compile the whole project first.
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "compile" );
+ verifier.addCliArgument( "compile" );
+ verifier.execute();
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.setLogFileName( "log-withfile.txt" );
verifier.addCliOption( "-f" );
verifier.addCliOption( "app/pom.xml" );
- verifier.executeGoal( "compile" );
+ verifier.addCliArgument( "compile" );
+ verifier.execute();
}
/**
@@ -103,7 +107,8 @@
verifier.addCliOption( "-f" );
verifier.addCliOption( "app/pom.xml" );
verifier.setLogFileName( "log-withfilealsomake.txt" );
- verifier.executeGoal( "compile" );
+ verifier.addCliArgument( "compile" );
+ verifier.execute();
verifier.verifyTextInLog( "Building Maven Integration Test :: MNG-6118 :: Library 1.0" );
}
@@ -119,7 +124,8 @@
Verifier verifier = newVerifier( submoduleDirectory.getAbsolutePath() );
verifier.addCliOption( "-am" );
verifier.setLogFileName( "log-insubmodulealsomake.txt" );
- verifier.executeGoal( "compile" );
+ verifier.addCliArgument( "compile" );
+ verifier.execute();
verifier.verifyTextInLog( "Building Maven Integration Test :: MNG-6118 :: Library 1.0" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java
index e397b38..88250d5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java
@@ -53,7 +53,8 @@
// install the test plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
File modAconfigurationFile = new File( modAprojectDir, "configuration.txt" );
@@ -65,7 +66,8 @@
// build the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( modAconfigurationFile.getCanonicalPath() );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java
index b19732f..f56459a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java
@@ -63,7 +63,8 @@
verifier.deleteDirectory( "module-2/target" );
verifier.addCliOption( "-pl" );
verifier.addCliOption( "module-1" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties properties = verifier.loadProperties( "module-1/target/session.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java
index 4e59acb..ae68477 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java
@@ -60,7 +60,8 @@
verifier.deleteDirectory( "module-2/target" );
verifier.addCliOption( "-pl" );
verifier.addCliOption( "module-1" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties properties = verifier.loadProperties( "module-1/target/session.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java
index 7a314b0..cdf52d7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java
@@ -50,7 +50,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyTextInLog( "[WARNING] Reporting configuration should be done in <reporting> section" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java
index af4e422..6f32089 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java
@@ -54,7 +54,8 @@
verifier.deleteArtifacts( "org.apache.maven.its.it-core-extensions-custom-scopes" );
verifier.addCliOption( "-s" );
verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java
index 39ac9d9..f3776bf 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java
@@ -114,7 +114,8 @@
verifier.addCliOption( option ); // -f/--file client/pom.xml
verifier.addCliOption( ( pom ? new File( testDir, "pom.xml" ) : testDir ).getAbsolutePath() );
verifier.setForkJvm( true ); // force forked JVM since we need the shell script to detect .mvn/ location
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "expression.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java
index 53d6271..c828f2c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java
@@ -62,11 +62,13 @@
File projectDir = new File( testDir, "project" );
Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "deploy" );
+ verifier.addCliArgument( "deploy" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java
index fdc7c90..2fde116 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java
@@ -92,7 +92,8 @@
Verifier verifier = newVerifier( baseDir.getAbsolutePath() );
verifier.addCliOption( "-Dexpression.outputFile=" + new File( baseDir, "expression.properties" ).getAbsolutePath() );
verifier.setForkJvm( true );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "expression.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java
index 87b89ad..3e07bc3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java
@@ -89,7 +89,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.addCliOption( option ); // -f/--file
verifier.addCliOption( "\"" + new File( resourceDir, subDir ).getAbsolutePath() + "\"" ); // "<path>"
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java
index ff8037e..35eead4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java
@@ -52,7 +52,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
fail( "should have failed ");
}
catch ( VerificationException e )
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java
index f703350..77b7304 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java
@@ -50,7 +50,8 @@
try
{
- verifier.executeGoal( "validate");
+ verifier.addCliArgument( "validate");
+ verifier.execute();
fail( "Should fail due to non-resolvable parent" );
}
catch ( VerificationException e )
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java
index 1f4738a..370b3cf 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java
@@ -50,7 +50,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log-basic.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/profile.properties" );
@@ -80,7 +81,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log-basic.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/profile.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java
index dd13614..c2bdf41 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java
@@ -66,7 +66,8 @@
verifier.setAutoclean( false );
verifier.setLogFileName( "version-log.txt" );
- verifier.executeGoals( Arrays.asList( "clean" ) );
+ verifier.addCliArgument( "clean" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> loadedLines = verifier.loadLines( "version-log.txt", "UTF-8" );
@@ -110,7 +111,8 @@
verifier.setAutoclean( false );
verifier.setLogFileName( "version-log.txt" );
- verifier.executeGoals( Arrays.asList( "clean" ) );
+ verifier.addCliArguments( "clean" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> loadedLines = verifier.loadLines( "version-log.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java
index f3acea1..04f62c7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java
@@ -48,11 +48,13 @@
Verifier verifier;
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyTextInLog( "MNG-6506 check succeeded" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java
index f002bda..2d6f77a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java
@@ -49,13 +49,16 @@
@Test
public void testSelectExistingOptionalProfile() throws VerificationException
{
- newVerifier( testDir.getAbsolutePath() ).executeGoal( "clean" );
+ Verifier cleaner = newVerifier( testDir.getAbsolutePath() );
+ cleaner.addCliArgument( "clean" );
+ cleaner.execute();
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setLogFileName( "log-select-existing.txt" );
verifier.addCliOption( "-pl" );
verifier.addCliOption( "?existing-module" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "existing-module/target/touch.txt" ); // existing-module should have been built.
}
@@ -63,13 +66,16 @@
@Test
public void testSelectExistingOptionalProfileByArtifactId() throws VerificationException
{
- newVerifier( testDir.getAbsolutePath() ).executeGoal( "clean" );
+ Verifier cleaner = newVerifier( testDir.getAbsolutePath() );
+ cleaner.addCliArgument( "clean" );
+ cleaner.execute();
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setLogFileName( "log-select-existing-artifact-id.txt" );
verifier.addCliOption( "-pl" );
verifier.addCliOption( "?:existing-module" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "existing-module/target/touch.txt" ); // existing-module should have been built.
}
@@ -77,13 +83,16 @@
@Test
public void testSelectNonExistingOptionalProfile() throws VerificationException
{
- newVerifier( testDir.getAbsolutePath() ).executeGoal( "clean" );
+ Verifier cleaner = newVerifier( testDir.getAbsolutePath() );
+ cleaner.addCliArgument( "clean" );
+ cleaner.execute();
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setLogFileName( "log-select-non-existing.txt" );
verifier.addCliOption( "-pl" );
verifier.addCliOption( "?non-existing-module" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "existing-module/target/touch.txt" ); // existing-module should have been built.
}
@@ -91,13 +100,16 @@
@Test
public void testDeselectExistingOptionalProfile() throws VerificationException
{
- newVerifier( testDir.getAbsolutePath() ).executeGoal( "clean" );
+ Verifier cleaner = newVerifier( testDir.getAbsolutePath() );
+ cleaner.addCliArgument( "clean" );
+ cleaner.execute();
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setLogFileName( "log-deselect-existing.txt" );
verifier.addCliOption( "-pl" );
verifier.addCliOption( "!?existing-module" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "existing-module/target/touch.txt" ); // existing-module should not have been built.
}
@@ -105,13 +117,16 @@
@Test
public void testDeselectNonExistingOptionalProfile() throws VerificationException
{
- newVerifier( testDir.getAbsolutePath() ).executeGoal( "clean" );
+ Verifier cleaner = newVerifier( testDir.getAbsolutePath() );
+ cleaner.addCliArgument( "clean" );
+ cleaner.execute();
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setLogFileName( "log-deselect-non-existing.txt" );
verifier.addCliOption( "-pl" );
verifier.addCliOption( "!?non-existing-module" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "existing-module/target/touch.txt" ); // existing-module should have been built.
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java
index d3492a6..c806562 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java
@@ -56,7 +56,8 @@
verifier.deleteDirectory( "target" );
verifier.addCliArgument( "-Dmaven.ext.class.path=spy-0.1.jar" );
verifier.addCliOption( "-X" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadLines( "target/spy.log", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java
index 39d0194..632d78e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java
@@ -49,7 +49,8 @@
verifier.setForkJvm( true ); // required due to --fail-on-severity
verifier.addCliOption( "-fos" );
verifier.addCliOption( "WARN" ); // ALSO NO WARNINGS
- verifier.executeGoals( Arrays.asList( phase ) );
+ verifier.addCliArgument( phase );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -68,7 +69,8 @@
verifier.setForkJvm( true ); // required due to --fail-on-severity
verifier.addCliOption( "-fos" );
verifier.addCliOption( "WARN" ); // ALSO NO WARNINGS
- verifier.executeGoals( Arrays.asList( phase ) );
+ verifier.addCliArgument( phase );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -83,7 +85,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
verifier.setAutoclean( false );
verifier.setLogFileName( phase +".txt" );
- verifier.executeGoals( Arrays.asList( phase ) );
+ verifier.addCliArgument( phase );
+ verifier.execute();
verifier.verifyTextInLog( "Version not locked for default bindings plugins [maven-compiler-plugin]"
+ ", you should define versions in pluginManagement section of your pom.xml or parent" );
@@ -99,7 +102,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
verifier.setAutoclean( false );
verifier.setLogFileName( phase +".txt" );
- verifier.executeGoals( Arrays.asList( phase ) );
+ verifier.addCliArgument( phase );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyTextInLog( "Version not locked for default bindings plugins [maven-compiler-plugin]"
@@ -116,7 +120,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
verifier.setAutoclean( false );
verifier.setLogFileName( phase +".txt" );
- verifier.executeGoals( Arrays.asList( phase ) );
+ verifier.addCliArgument( phase );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyTextInLog( "Version not locked for default bindings plugins [maven-compiler-plugin]"
@@ -133,7 +138,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
verifier.setAutoclean( false );
verifier.setLogFileName( phase +".txt" );
- verifier.executeGoals( Arrays.asList( phase ) );
+ verifier.addCliArgument( phase );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyTextInLog( "Version not locked for default bindings plugins [maven-compiler-plugin, maven-surefire-plugin]"
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java
index 242ff6d..2b2ee34 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java
@@ -50,7 +50,8 @@
File pluginDir = new File( testDir, "plugin" );
Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -62,7 +63,8 @@
Verifier verifier = newVerifier( consumerDir.getAbsolutePath() );
verifier.setLogFileName( "log-direct-plugin-invocation.txt" );
- verifier.executeGoal( PLUGIN_KEY + ":require-compile-phase" );
+ verifier.addCliArgument( PLUGIN_KEY + ":require-compile-phase" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
assertCompiledOnce( verifier );
@@ -82,7 +84,8 @@
Verifier verifier = newVerifier( consumerDir.getAbsolutePath() );
verifier.setLogFileName( "log-phase-execution.txt" );
- verifier.executeGoal( "compile" );
+ verifier.addCliArgument( "compile" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
assertCompiledOnce( verifier );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java
index 15c6aa2..d5047d5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java
@@ -35,7 +35,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/profile.properties" );
assertEquals( "pom", props.getProperty( "project.properties.packaging" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java
index 74adffa..692a9cc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java
@@ -77,7 +77,8 @@
verifier.setAutoclean( false );
verifier.addCliOption( "-Dchangelist=MNG6656" );
- verifier.executeGoals( Collections.singletonList( "install" ) );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
assertTextEquals( new File( testDir, "expected/parent.pom"),
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java
index b0d3b7d..aacb770 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java
@@ -59,7 +59,8 @@
verifier.deleteDirectory( "repo" );
verifier.deleteArtifacts ( "org.apache.maven.its.mng6754" );
verifier.addCliOption( "-Drepodir=" + remoteRepoDir );
- verifier.executeGoal( "deploy" );
+ verifier.addCliArgument( "deploy" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
final Properties props = verifier.loadProperties( "target/timestamp.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java
index e5cab27..17112d2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java
@@ -51,7 +51,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
+ verifier.addCliArgument( "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -69,7 +70,8 @@
{
verifier.addCliOption( "-DaltDeploymentRepository=customRepo::" + customRepoUri );
}
- verifier.executeGoal( "deploy" );
+ verifier.addCliArgument( "deploy" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java
index 252a4ff..afc4bd7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java
@@ -60,7 +60,8 @@
verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
@@ -77,7 +78,8 @@
verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "compile" );
+ verifier.addCliArgument( "compile" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java
index 3950b58..af135c0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java
@@ -77,7 +77,8 @@
verifier.setAutoclean( false );
verifier.addCliOption( "-Dchangelist=MNG6957" );
- verifier.executeGoals( Collections.singletonList( "install" ) );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
assertTextEquals( new File( testDir, "expected/parent.pom"),
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java
index 48ef13b..bac8259 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java
@@ -61,12 +61,14 @@
verifier = newVerifier( new File( testDir.getAbsolutePath(), "build-plugin" ).getAbsolutePath() );
verifier.getSystemProperties().put( "maven.multiModuleProjectDirectory", testDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( new File( testDir.getAbsolutePath(), "using-module" ).getAbsolutePath() );
verifier.getSystemProperties().put( "maven.multiModuleProjectDirectory", testDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java
index 539ed15..57e50c1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java
@@ -48,7 +48,8 @@
verifier.addCliOption( "-pl" );
verifier.addCliOption( ":module-a" );
- verifier.executeGoal( "compile" );
+ verifier.addCliArgument( "compile" );
+ verifier.execute();
verifier.verifyTextInLog( "Building module-a-1 1.0" );
}
@@ -68,7 +69,8 @@
verifier.addCliOption( "module-a" );
verifier.addCliOption( "--non-recursive" );
verifier.setLogFileName( "log-non-recursive.txt" );
- verifier.executeGoal( "compile" );
+ verifier.addCliArgument( "compile" );
+ verifier.execute();
verifyTextNotInLog( verifier, "Building module-a-1 1.0" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java
index b4d74a8..63fe0fd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java
@@ -47,7 +47,8 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-7045" );
Verifier verifier = newVerifier( testDir.getAbsolutePath()) ;
- verifier.executeGoal( "process-classes" );
+ verifier.addCliArgument( "process-classes" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java
index 6475a55..eb1596b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java
@@ -54,7 +54,8 @@
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
fail( "Activated a non-existing profile without ? prefix should break the build, but it didn't." );
}
catch ( VerificationException ve )
@@ -79,7 +80,8 @@
verifier.addCliOption( "?non-existing-profile" );
verifier.setLogFileName( "test-non-breaking.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyTextInLog( "[INFO] The requested optional profiles [non-existing-profile] could not be activated or deactivated because they do not exist." );
}
@@ -99,7 +101,8 @@
verifier.addCliOption( "?non-existing-profile,existing" );
verifier.setLogFileName( "test-non-breaking-mixed.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyTextInLog( "[INFO] The requested optional profiles [non-existing-profile] could not be activated or deactivated because they do not exist." );
}
@@ -119,7 +122,8 @@
verifier.addCliOption( "!?non-existing-profile" );
verifier.setLogFileName( "test-deactivating-non-breaking.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyTextInLog( "[INFO] The requested optional profiles [non-existing-profile] could not be activated or deactivated because they do not exist." );
}
@@ -139,7 +143,8 @@
verifier.addCliOption( "!?non-existing-profile,!existing" );
verifier.setLogFileName( "test-deactivating-non-breaking-mixed.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyTextInLog( "[INFO] The requested optional profiles [non-existing-profile] could not be activated or deactivated because they do not exist." );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java
index 721c675..2395300 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java
@@ -45,19 +45,23 @@
final File projectDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-7110-extensionclassloader" );
final Verifier extensionVerifier = newVerifier( new File( projectDir, "extension" ).getAbsolutePath() );
- extensionVerifier.executeGoal( "install" );
+ extensionVerifier.addCliArgument( "install" );
+ extensionVerifier.execute();
extensionVerifier.verifyErrorFreeLog();
final Verifier libVerifier = newVerifier( new File( projectDir, "lib" ).getAbsolutePath() );
- libVerifier.executeGoal( "install" );
+ libVerifier.addCliArgument( "install" );
+ libVerifier.execute();
libVerifier.verifyErrorFreeLog();
final Verifier bomVerifier = newVerifier( new File( projectDir, "bom" ).getAbsolutePath() );
- bomVerifier.executeGoal( "install" );
+ bomVerifier.addCliArgument( "install" );
+ bomVerifier.execute();
bomVerifier.verifyErrorFreeLog();
final Verifier projectVerifier = newVerifier( new File( projectDir, "module" ).getAbsolutePath() );
- projectVerifier.executeGoal( "verify" );
+ projectVerifier.addCliArgument( "verify" );
+ projectVerifier.execute();
projectVerifier.verifyErrorFreeLog();
Properties properties = new Properties();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java
index 10a1c7c..8d3b742 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java
@@ -43,7 +43,8 @@
throws IOException, VerificationException
{
final File projectDir = ResourceExtractor.simpleExtractResources( getClass(), PROJECT_PATH );
- newVerifier( projectDir.getAbsolutePath() ).executeGoal( "clean" );
+ newVerifier( projectDir.getAbsolutePath() ).addCliArgument( "clean" );
+ newVerifier( projectDir.getAbsolutePath() ).execute();
final Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
@@ -51,7 +52,8 @@
verifier.addCliOption( ":aggregator-a,:aggregator-b" );
verifier.addCliOption( "-N" );
verifier.setLogFileName( "selected-non-recursive.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFilePresent( "aggregator-a/target/touch.txt" );
@@ -65,7 +67,8 @@
throws IOException, VerificationException
{
final File projectDir = ResourceExtractor.simpleExtractResources( getClass(), PROJECT_PATH );
- newVerifier( projectDir.getAbsolutePath() ).executeGoal( "clean" );
+ newVerifier( projectDir.getAbsolutePath() ).addCliArgument( "clean" );
+ newVerifier( projectDir.getAbsolutePath() ).execute();
final Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
@@ -73,7 +76,8 @@
verifier.addCliOption( "!:aggregator-a,!:aggregator-b" );
verifier.addCliOption( "-N" );
verifier.setLogFileName( "excluded-non-recursive.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "aggregator-a/target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java
index e551651..e5e2f4a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java
@@ -53,7 +53,8 @@
try
{
- verifier.executeGoal( "compiler:compile" );
+ verifier.addCliArgument( "compiler:compile" );
+ verifier.execute();
fail( "HTTP repository defined in pom.xml should have failed the build but did not." );
}
catch ( VerificationException ve )
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java
index 624778c..d87f22b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java
@@ -42,29 +42,34 @@
final File projectDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-7160-extensionclassloader" );
final Verifier extensionVerifier = newVerifier( new File( projectDir, "extension" ).getAbsolutePath() );
- extensionVerifier.executeGoal( "install" );
+ extensionVerifier.addCliArgument( "install" );
+ extensionVerifier.execute();
extensionVerifier.verifyErrorFreeLog();
final Verifier verifier1 = newVerifier( new File( projectDir, "project-build" ).getAbsolutePath() );
- verifier1.executeGoal( "install" );
+ verifier1.addCliArgument( "install" );
+ verifier1.execute();
verifier1.verifyErrorFreeLog();
verifier1.verifyTextInLog( "xpp3 -> mvn" );
verifier1.verifyTextInLog( "base64 -> ext" );
final Verifier verifier2 = newVerifier( new File( projectDir, "project-core-parent-first" ).getAbsolutePath() );
- verifier2.executeGoal( "install" );
+ verifier2.addCliArgument( "install" );
+ verifier2.execute();
verifier2.verifyErrorFreeLog();
verifier2.verifyTextInLog( "xpp3 -> mvn" );
verifier2.verifyTextInLog( "base64 -> mvn" );
final Verifier verifier3 = newVerifier( new File( projectDir, "project-core-plugin" ).getAbsolutePath() );
- verifier3.executeGoal( "verify" );
+ verifier3.addCliArgument( "verify" );
+ verifier3.execute();
verifier3.verifyErrorFreeLog();
verifier3.verifyTextInLog( "xpp3 -> mvn" );
verifier3.verifyTextInLog( "base64 -> ext" );
final Verifier verifier4 = newVerifier( new File( projectDir, "project-core-self-first" ).getAbsolutePath() );
- verifier4.executeGoal( "verify" );
+ verifier4.addCliArgument( "verify" );
+ verifier4.execute();
verifier4.verifyErrorFreeLog();
verifier4.verifyTextInLog( "xpp3 -> ext" );
verifier4.verifyTextInLog( "base64 -> ext" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java
index 60249ae..575f538 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java
@@ -43,7 +43,8 @@
final File projectDir = ResourceExtractor.simpleExtractResources( getClass(), PROJECT_PATH );
final Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifyLogDoesNotContainUnexpectedWarning( verifier );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java
index 5bd90d4..0cfe502 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java
@@ -49,9 +49,11 @@
File projectTestDir = ResourceExtractor.simpleExtractResources( getClass(), BASE_TEST_DIR + "/project" );
Verifier verifier = newVerifier( extensionTestDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
Verifier verifier2 = newVerifier( projectTestDir.getAbsolutePath() );
- verifier2.executeGoal( "compile" );
+ verifier2.addCliArgument( "compile" );
+ verifier2.execute();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java
index fe60e22..4d7c9ec 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java
@@ -45,7 +45,8 @@
final File projectDir = ResourceExtractor.simpleExtractResources( getClass(), PROJECT_PATH );
final Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.addCliOption( "-T1C" );
- verifier.executeGoals( Arrays.asList( "clean", "package" ) );
+ verifier.addCliArguments( "clean", "package" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7349RelocationWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7349RelocationWarningTest.java
index 9d6a05e..608143b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7349RelocationWarningTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7349RelocationWarningTest.java
@@ -49,11 +49,13 @@
Verifier verifier;
verifier = newVerifier( artifactsDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectDir.getAbsolutePath() );
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> lines = verifier.loadLines( verifier.getLogFileName(), "UTF-8" );
List<String> relocated = new ArrayList<>();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7353CliGoalInvocationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7353CliGoalInvocationTest.java
index 7d4093f..01fb201 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7353CliGoalInvocationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7353CliGoalInvocationTest.java
@@ -44,7 +44,8 @@
File basedir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-7353-cli-goal-invocation" );
Verifier verifier = newVerifier( basedir.getAbsolutePath() );
verifier.setLogFileName( id + ".txt" );
- verifier.executeGoal( goal );
+ verifier.addCliArgument( goal );
+ verifier.execute();
verifier.verifyTextInLog( "[INFO] --- " + expectedInvocation );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7360BuildConsumer.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7360BuildConsumer.java
index d2bf033..d088e15 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7360BuildConsumer.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7360BuildConsumer.java
@@ -48,7 +48,8 @@
{
final File projectDir = ResourceExtractor.simpleExtractResources( getClass(), PROJECT_PATH );
final Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java
index 93ddbb2..8c8d494 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java
@@ -53,7 +53,8 @@
final Verifier verifier = newVerifier( moduleADir.getAbsolutePath() );
verifier.addCliOption( "-f" );
verifier.addCliOption( ".." );
- verifier.executeGoal( "clean" );
+ verifier.addCliArgument( "clean" );
+ verifier.execute();
}
@Test
@@ -64,7 +65,8 @@
verifier.addCliOption( "-pl" );
verifier.addCliOption( ":module-b" );
verifier.setLogFileName( "log-module-by-coordinate.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "../target/touch.txt" );
verifier.verifyFilePresent( "../module-b/target/touch.txt" );
@@ -78,7 +80,8 @@
verifier.addCliOption( "-pl" );
verifier.addCliOption( ":module-b,:module-a" );
verifier.setLogFileName( "log-modules-by-coordinate.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "../target/touch.txt" );
verifier.verifyFilePresent( "../module-b/target/touch.txt" );
@@ -92,7 +95,8 @@
verifier.addCliOption( "-pl" );
verifier.addCliOption( "../module-b" );
verifier.setLogFileName( "log-module-by-relative-path.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "../target/touch.txt" );
verifier.verifyFilePresent( "../module-b/target/touch.txt" );
@@ -106,7 +110,8 @@
verifier.addCliOption( "-pl" );
verifier.addCliOption( "../module-b,." );
verifier.setLogFileName( "log-modules-by-relative-path.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "../target/touch.txt" );
verifier.verifyFilePresent( "../module-b/target/touch.txt" );
@@ -128,7 +133,8 @@
verifier.setLogFileName( "log-modules-by-relative-path-no-dotmvn.txt" );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
fail( "Expected goal to fail" );
}
catch ( VerificationException e )
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java
index 53660ca..cd94c10 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java
@@ -43,7 +43,8 @@
final File projectDir = ResourceExtractor.simpleExtractResources( getClass(), PROJECT_PATH );
final Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifyLogDoesNotContainUnexpectedWarning( verifier );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java
index 88bea5a..2d98f85 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java
@@ -49,7 +49,8 @@
verifier.addCliOption( "-P" );
verifier.addCliOption( "?does-not-exist-either" );
- verifier.executeGoals( Arrays.asList( "clean", "verify" ) );
+ verifier.addCliArguments( "clean", "verify" );
+ verifier.execute();
final List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java
index 61fbdc0..c6bca72 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java
@@ -54,7 +54,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log-empty-configuration.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
@@ -77,7 +78,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log-read-only-property.txt" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
@@ -102,7 +104,8 @@
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log-read-only-configuration.txt" );
verifier.addCliOption( "-Pconfig-values" );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java
index 67c47a6..ffced2f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java
@@ -160,7 +160,8 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-7468-unsupported-params" );
Verifier verifier = newVerifier( new File( testDir, project ).getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java
index 337ccbe..e39bc0d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java
@@ -90,7 +90,8 @@
// Maven will fail if project dependencies cannot be resolved.
// As dependency exists ONLY in HTTP repo, it MUST be reached using selected transport and
// successfully resolved from it.
- verifier.executeGoal( "verify" );
+ verifier.addCliArgument( "verify" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
// verify maven console output contains "[DEBUG] Using transporter XXXTransporter"
verifier.verifyTextInLog( logSnippet );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java
index f792513..59dcac4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java
@@ -45,11 +45,13 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-7474-session-scope" );
Verifier verifier = newVerifier( new File( testDir, "plugin" ).getAbsolutePath() );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier = newVerifier( new File( testDir, "project" ).getAbsolutePath() );
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java
index 902e539..0d4c9f9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java
@@ -43,13 +43,15 @@
final File pluginDir = new File( rootDir, "plugin" );
final Verifier pluginVerifier = newVerifier( pluginDir.getAbsolutePath() );
- pluginVerifier.executeGoal( "install" );
+ pluginVerifier.addCliArgument( "install" );
+ pluginVerifier.execute();
final File consumerDir = new File( rootDir, "consumer" );
final Verifier consumerVerifier = newVerifier( consumerDir.getAbsolutePath() );
consumerVerifier.setForkJvm( true );;
consumerVerifier.addCliOption( "-T2" );
- consumerVerifier.executeGoal( "package" );
+ consumerVerifier.addCliArgument( "package" );
+ consumerVerifier.execute();
consumerVerifier.verifyErrorFreeLog();
consumerVerifier.verifyTextInLog( "BUILD SUCCESS" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java
index 2c590f8..0d57f0a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java
@@ -53,7 +53,8 @@
Verifier verifier = newVerifier( rootDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal( "site" );
+ verifier.addCliArgument( "site" );
+ verifier.execute();
List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java
index 58ecf7d..d058d79 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java
@@ -54,7 +54,8 @@
verifier.addCliOption("settings.xml");
verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties());
- verifier.executeGoal("validate");
+ verifier.addCliArgument("validate");
+ verifier.execute();
verifier.verifyErrorFreeLog();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java
index 240dded..c8b099d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java
@@ -40,7 +40,8 @@
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
try
{
- verifier.executeGoal( "validate" );
+ verifier.addCliArgument( "validate" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
fail( "Build did not fail despite unsatisfied prerequisite of plugin on Maven version." );
}
@@ -69,7 +70,8 @@
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.executeGoal( "org.apache.maven.its.mng7566:maven-mng7566-plugin:touch" );
+ verifier.addCliArgument( "org.apache.maven.its.mng7566:maven-mng7566-plugin:touch" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/touch-1.txt" );
diff --git a/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/java/MavenITmngXXXXDescriptionOfProblemTest.java b/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/java/MavenITmngXXXXDescriptionOfProblemTest.java
index 0433ac9..5538d59 100644
--- a/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/java/MavenITmngXXXXDescriptionOfProblemTest.java
+++ b/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/java/MavenITmngXXXXDescriptionOfProblemTest.java
@@ -90,7 +90,8 @@
List cliOptions = new ArrayList();
cliOptions.add( "-N" );
verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
/*
* This is the simplest way to check a build
@@ -111,7 +112,8 @@
* preparation for the test.
*/
verifier = new Verifier( new File( testDir.getAbsolutePath(), "checkstyle-assembly" ).getAbsolutePath() );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
/*
@@ -123,7 +125,8 @@
* particular test will fail in Maven <2.0.6.
*/
verifier = new Verifier( new File( testDir.getAbsolutePath(), "checkstyle-test" ).getAbsolutePath() );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
/*
diff --git a/core-it-support/maven-it-sample/src/test/java/org/apache/maven/it/MavenITmngXXXXDescriptionOfProblemTest.java b/core-it-support/maven-it-sample/src/test/java/org/apache/maven/it/MavenITmngXXXXDescriptionOfProblemTest.java
index 9305bc9..3ceef1e 100644
--- a/core-it-support/maven-it-sample/src/test/java/org/apache/maven/it/MavenITmngXXXXDescriptionOfProblemTest.java
+++ b/core-it-support/maven-it-sample/src/test/java/org/apache/maven/it/MavenITmngXXXXDescriptionOfProblemTest.java
@@ -87,7 +87,8 @@
List cliOptions = new ArrayList();
cliOptions.add( "-N" );
verifier.setCliOptions( cliOptions );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
/*
* This is the simplest way to check a build
@@ -108,7 +109,8 @@
* preparation for the test.
*/
verifier = new Verifier( new File( testDir.getAbsolutePath(), "checkstyle-assembly" ).getAbsolutePath() );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
/*
@@ -120,7 +122,8 @@
* particular test will fail in Maven <2.0.6.
*/
verifier = new Verifier( new File( testDir.getAbsolutePath(), "checkstyle-test" ).getAbsolutePath() );
- verifier.executeGoal( "install" );
+ verifier.addCliArgument( "install" );
+ verifier.execute();
verifier.verifyErrorFreeLog();
/*
