You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2013/05/20 16:36:45 UTC

[1/6] replaced verifier.getCliOptions().add() with verifier.addCliOption()

Updated Branches:
  refs/heads/master 82df43e95 -> c304ba2bd


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java
----------------------------------------------------------------------
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 d2781b0..33c8fc0 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
@@ -52,8 +52,8 @@ public class MavenITmng4963ParentResolutionFromMirrorTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4963" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java
----------------------------------------------------------------------
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 bdf2c0b..ccdaf2a 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
@@ -53,8 +53,8 @@ public class MavenITmng4973ExtensionVisibleToPluginInReactorTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "sub-b/target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4973" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java
----------------------------------------------------------------------
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 0304fd5..9c0ecae 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
@@ -51,13 +51,13 @@ public class MavenITmng4975ProfileInjectedPluginExecutionOrderTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-Pprofile2,profile1" );
+        verifier.addCliOption( "-Pprofile2,profile1" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List lines = verifier.loadLines( "target/exec.log", "UTF-8" );
-        List expected = Arrays.asList( new String[] { "1", "2", "3", "4", "5" } );
+        List<String> lines = verifier.loadLines( "target/exec.log", "UTF-8" );
+        List<String> expected = Arrays.asList( new String[] { "1", "2", "3", "4", "5" } );
         assertEquals( expected, lines );
     }
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java
----------------------------------------------------------------------
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 e351b29..ae31644 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
@@ -52,14 +52,14 @@ public class MavenITmng4987TimestampBasedSnapshotSelectionTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4987" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
+        List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
 
         assertTrue( compile.toString(), compile.get( 1 ).toString().startsWith( "dep-0.1-" ) );
     }

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java
----------------------------------------------------------------------
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 4835eb3..385573c 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
@@ -84,8 +84,8 @@ public class MavenITmng4991NonProxyHostsTest
             filterProps.setProperty( "@proxyPort@", Integer.toString( proxy.getConnectors()[0].getLocalPort() ) );
             filterProps.setProperty( "@localhost@", InetAddress.getLocalHost().getCanonicalHostName() );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-            verifier.getCliOptions().add( "-s" );
-            verifier.getCliOptions().add( "settings.xml" );
+            verifier.addCliOption( "-s" );
+            verifier.addCliOption( "settings.xml" );
             verifier.executeGoal( "validate" );
             verifier.verifyErrorFreeLog();
         }
@@ -96,7 +96,7 @@ public class MavenITmng4991NonProxyHostsTest
             proxy.stop();
         }
 
-        List compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
+        List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
 
         assertTrue( compile.toString(), compile.contains( "dep-0.1.jar" ) );
     }

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java
----------------------------------------------------------------------
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 702a7ef..a439f70 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
@@ -54,14 +54,14 @@ public class MavenITmng5006VersionRangeDependencyParentResolutionTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng5006" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
+        List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
 
         assertTrue( compile.toString(), compile.contains( "a-0.1.jar" ) );
         assertTrue( compile.toString(), compile.contains( "b-0.1.jar" ) );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java
----------------------------------------------------------------------
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 a9a6f2b..52b7a6a 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
@@ -23,7 +23,6 @@ import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
-import java.util.Properties;
 
 /**
  * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-5009">MNG-5009</a>.

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java
----------------------------------------------------------------------
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 17fe4bd..bc308fb 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
@@ -50,8 +50,8 @@ public class MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng5019" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java
----------------------------------------------------------------------
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 38da3fd..0106b25 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
@@ -64,7 +64,7 @@ public class MavenITmng5064SuppressSnapshotUpdatesTest
 
         String metadataUri = "org/apache/maven/its/mng5064/dep/0.1-SNAPSHOT/maven-metadata.xml";
 
-        final List requestedUris = Collections.synchronizedList( new ArrayList() );
+        final List<String> requestedUris = Collections.synchronizedList( new ArrayList<String>() );
 
         AbstractHandler logHandler = new AbstractHandler()
         {
@@ -99,15 +99,15 @@ public class MavenITmng5064SuppressSnapshotUpdatesTest
             Properties filterProps = verifier.newDefaultFilterProperties();
             filterProps.setProperty( "@port@", Integer.toString( server.getConnectors()[0].getLocalPort() ) );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-            verifier.getCliOptions().add( "-nsu" );
-            verifier.getCliOptions().add( "-s" );
-            verifier.getCliOptions().add( "settings.xml" );
+            verifier.addCliOption( "-nsu" );
+            verifier.addCliOption( "-s" );
+            verifier.addCliOption( "settings.xml" );
 
             verifier.setLogFileName( "log-1.txt" );
             verifier.executeGoal( "validate" );
             verifier.verifyErrorFreeLog();
 
-            List classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
+            List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
             assertTrue( classpath.toString(), classpath.contains( "dep-0.1-SNAPSHOT.jar" ) );
             assertTrue( requestedUris.toString(), requestedUris.contains( metadataUri ) );
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java
----------------------------------------------------------------------
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 ddace1a..9d123b2 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
@@ -53,14 +53,14 @@ public class MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng5096" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
+        List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
 
         assertFalse( compile.toString(), compile.contains( "a-0.1.jar" ) );
         assertTrue( compile.toString(), compile.contains( "b-0.1.jar" ) );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java
----------------------------------------------------------------------
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 9da5236..9f485b1 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
@@ -51,14 +51,14 @@ public class MavenITmng5135AggregatorDepResolutionModuleExtensionTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng5135" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        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.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List compile = verifier.loadLines( "target/module.txt", "UTF-8" );
+        List<String> compile = verifier.loadLines( "target/module.txt", "UTF-8" );
 
         assertTrue( compile.toString(), compile.contains( "dep-0.1-it.jar" ) );
     }

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java
----------------------------------------------------------------------
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 244d50f..fd03548 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,7 +60,7 @@ public class MavenITmng5137ReactorResolutionInForkedBuildTest
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List compile = verifier.loadLines( "consumer/target/compile.txt", "UTF-8" );
+        List<String> compile = verifier.loadLines( "consumer/target/compile.txt", "UTF-8" );
 
         assertTrue( compile.toString(), compile.contains( "producer/pom.xml" ) );
     }

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java
----------------------------------------------------------------------
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 6c40814..11fee8d 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
@@ -110,9 +110,9 @@ public class MavenITmng5175WagonHttpTest
 
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
 
-        verifier.getCliOptions().add( "-U" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-U" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         //verifier.
         verifier.executeGoal( "validate" );
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java
----------------------------------------------------------------------
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 7b0e744..903fc7e 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
@@ -22,7 +22,6 @@ package org.apache.maven.it;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
-import java.util.List;
 
 /**
  * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-5206">MNG-5206</a>.

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java
----------------------------------------------------------------------
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 9e24676..8a8339f 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
@@ -20,7 +20,6 @@ package org.apache.maven.it;
  */
 
 import java.io.File;
-import java.util.List;
 import org.apache.maven.it.util.ResourceExtractor;
 
 public class MavenITmng5208EventSpyParallelTest
@@ -48,8 +47,8 @@ public class MavenITmng5208EventSpyParallelTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.setSystemProperty( "maven.ext.class.path", "../spy/target/event-spy-0.0.1-SNAPSHOT.jar" );
-        verifier.getCliOptions().add( "-X" );
-        verifier.getCliOptions().add( "-T 2" );
+        verifier.addCliOption( "-X" );
+        verifier.addCliOption( "-T 2" );
         verifier.addCliOption( "-fn" );
         verifier.executeGoal( "compile" );
         verifier.verifyTextInLog( "ProjectFailed/org.apache.maven.its.mng5208:sub-2" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java
----------------------------------------------------------------------
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 a3cfef9..541625b 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
@@ -60,8 +60,8 @@ public class MavenITmng5214DontMapWsdlToJar extends AbstractMavenIntegrationTest
         verifier.setLogFileName( "log-test.txt" );
         verifier.executeGoal( "test" );
         verifier.verifyErrorFreeLog();
-        List lines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
-        Iterator lineIt = lines.iterator();
+        List<String> lines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
+        Iterator<String> lineIt = lines.iterator();
         // RESOLVE-ONE-DEPENDENCY org.apache.maven.its.mng5214:dependency:wsdl:1.0-SNAPSHOT $ /tmp/it.repo/org/apache/maven/its/mng5214/dependency/1.0-SNAPSHOT/dependency-1.0-SNAPSHOT.wsdl
         while ( lineIt.hasNext() )
         {

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java
----------------------------------------------------------------------
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 99a747b..04990b3 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
@@ -22,7 +22,6 @@ package org.apache.maven.it;
 import org.apache.maven.it.util.ResourceExtractor;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
-import org.mortbay.jetty.Server;
 
 import java.io.File;
 import java.io.FileReader;
@@ -38,10 +37,6 @@ import java.util.List;
 public class MavenITmng5224InjectedSettings
     extends AbstractMavenIntegrationTestCase
 {
-    private Server server;
-
-    private int port;
-
     public MavenITmng5224InjectedSettings()
     {
         // olamy probably doesn't work with 3.x before 3.0.4
@@ -59,8 +54,8 @@ public class MavenITmng5224InjectedSettings
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
 
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         //verifier.
         verifier.executeGoal( "validate" );
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java
----------------------------------------------------------------------
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 5721789..0709552 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
@@ -97,8 +97,8 @@ public class MavenITmng5280SettingsProfilesRepositoriesOrderTest
         Properties filterProps = verifier.newDefaultFilterProperties();
         filterProps.setProperty( "@httpserver.port@", Integer.toString( httpPort ) );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
@@ -124,8 +124,8 @@ public class MavenITmng5280SettingsProfilesRepositoriesOrderTest
         Properties filterProps = verifier.newDefaultFilterProperties();
         filterProps.setProperty( "@httpserver.port@", Integer.toString( httpPort ) );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "org.apache.maven.its.mng5280:fake-maven-plugin:1.0:fake" );
         verifier.resetStreams();
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java
----------------------------------------------------------------------
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 36616e0..c526280 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
@@ -64,7 +64,7 @@ public class MavenITmng5338FileOptionToDirectory
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng5338" );
 
-        verifier.getCliOptions().add( "-f project" );
+        verifier.addCliOption( "-f project" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();


[2/6] replaced verifier.getCliOptions().add() with verifier.addCliOption()

Posted by hb...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java
----------------------------------------------------------------------
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 1639e91..71640fc 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
@@ -53,13 +53,13 @@ public class MavenITmng4526MavenProjectArtifactsScopeTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4526" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "generate-sources" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List artifacts;
+        List<String> artifacts;
         
         artifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
         assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4526:a:jar:0.1" ) );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java
----------------------------------------------------------------------
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 85d6b15..d3eb160 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
@@ -52,8 +52,8 @@ public class MavenITmng4553CoreArtifactFilterConsidersGroupIdTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4553" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java
----------------------------------------------------------------------
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 a7ff58b..225d30d 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
@@ -63,7 +63,7 @@ public class MavenITmng4554PluginPrefixMappingUpdateTest
 
         String metadataUri = "/repo-1/org/apache/maven/its/mng4554/maven-metadata.xml";
 
-        final List requestedUris = Collections.synchronizedList( new ArrayList() );
+        final List<String> requestedUris = Collections.synchronizedList( new ArrayList<String>() );
 
         AbstractHandler logHandler = new AbstractHandler()
         {
@@ -104,8 +104,8 @@ public class MavenITmng4554PluginPrefixMappingUpdateTest
             filterProps.setProperty( "@port@", Integer.toString( server.getConnectors()[0].getLocalPort() ) );
             filterProps.setProperty( "@repo@", "repo-1" );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-            verifier.getCliOptions().add( "-s" );
-            verifier.getCliOptions().add( "settings.xml" );
+            verifier.addCliOption( "-s" );
+            verifier.addCliOption( "settings.xml" );
 
             verifier.setLogFileName( "log-cached-1.txt" );
             verifier.executeGoal( "a:touch" );
@@ -140,7 +140,7 @@ public class MavenITmng4554PluginPrefixMappingUpdateTest
 
         String metadataUri = "/repo-1/org/apache/maven/its/mng4554/maven-metadata.xml";
 
-        final List requestedUris = Collections.synchronizedList( new ArrayList() );
+        final List<String> requestedUris = Collections.synchronizedList( new ArrayList<String>() );
 
         AbstractHandler logHandler = new AbstractHandler()
         {
@@ -181,9 +181,9 @@ public class MavenITmng4554PluginPrefixMappingUpdateTest
             filterProps.setProperty( "@port@", Integer.toString( server.getConnectors()[0].getLocalPort() ) );
             filterProps.setProperty( "@repo@", "repo-1" );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-            verifier.getCliOptions().add( "-U" );
-            verifier.getCliOptions().add( "-s" );
-            verifier.getCliOptions().add( "settings.xml" );
+            verifier.addCliOption( "-U" );
+            verifier.addCliOption( "-s" );
+            verifier.addCliOption( "settings.xml" );
 
             verifier.setLogFileName( "log-forced-1.txt" );
             verifier.executeGoal( "a:touch" );
@@ -220,7 +220,7 @@ public class MavenITmng4554PluginPrefixMappingUpdateTest
 
         String metadataUri = "/repo-it/org/apache/maven/its/mng4554/maven-metadata.xml";
 
-        final List requestedUris = Collections.synchronizedList( new ArrayList() );
+        final List<String> requestedUris = Collections.synchronizedList( new ArrayList<String>() );
 
         AbstractHandler logHandler = new AbstractHandler()
         {
@@ -261,8 +261,8 @@ public class MavenITmng4554PluginPrefixMappingUpdateTest
             filterProps.setProperty( "@port@", Integer.toString( server.getConnectors()[0].getLocalPort() ) );
             filterProps.setProperty( "@repo@", "repo-it" );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-            verifier.getCliOptions().add( "-s" );
-            verifier.getCliOptions().add( "settings.xml" );
+            verifier.addCliOption( "-s" );
+            verifier.addCliOption( "settings.xml" );
 
             FileUtils.copyDirectoryStructure( new File( testDir, "repo-1" ), new File( testDir, "repo-it" ) );
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java
----------------------------------------------------------------------
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 209e5fe..dac455d 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
@@ -58,7 +58,7 @@ public class MavenITmng4555MetaversionResolutionOfflineTest
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4555" );
 
-        final List uris = new ArrayList();
+        final List<String> uris = new ArrayList<String>();
 
         Handler repoHandler = new AbstractHandler()
         {
@@ -90,9 +90,9 @@ public class MavenITmng4555MetaversionResolutionOfflineTest
             Properties filterProps = verifier.newDefaultFilterProperties();
             filterProps.setProperty( "@port@", Integer.toString( server.getConnectors()[0].getLocalPort() ) );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-            verifier.getCliOptions().add( "--offline" );
-            verifier.getCliOptions().add( "--settings" );
-            verifier.getCliOptions().add( "settings.xml" );
+            verifier.addCliOption( "--offline" );
+            verifier.addCliOption( "--settings" );
+            verifier.addCliOption( "settings.xml" );
             verifier.executeGoal( "validate" );
         }
         catch ( VerificationException e )

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java
----------------------------------------------------------------------
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 d377b61..168c690 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
@@ -95,8 +95,8 @@ public class MavenITmng4561MirroringOfPluginRepoTest
             Properties filterProps = verifier.newDefaultFilterProperties();
             filterProps.setProperty( "@port@", Integer.toString( server.getConnectors()[0].getLocalPort() ) );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-            verifier.getCliOptions().add( "-s" );
-            verifier.getCliOptions().add( "settings.xml" );
+            verifier.addCliOption( "-s" );
+            verifier.addCliOption( "settings.xml" );
             verifier.executeGoal( "validate" );
             verifier.verifyErrorFreeLog();
             verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMngtTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMngtTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMngtTest.java
index 020e65f..0097a5a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMngtTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMngtTest.java
@@ -52,8 +52,8 @@ public class MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMngtTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4586" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "mng4586:touch" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java
index 8db516e..7637e22 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java
@@ -54,8 +54,8 @@ public class MavenITmng4590ImportedPomUsesSystemPropertiesTest
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.setEnvironmentVariable( "MAVEN_OPTS", "-Dtest.file=pom.xml" );
         verifier.setSystemProperty( "test.dir", testDir.getAbsolutePath() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java
----------------------------------------------------------------------
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 cf9b7ec..f86d157 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
@@ -75,13 +75,13 @@ public class MavenITmng4600DependencyOptionalFlagManagementTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4600" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
+        List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
         assertTrue( classpath.toString(), classpath.contains( "direct-0.2.jar" ) );
         assertTrue( classpath.toString(), classpath.contains( "transitive-0.1.jar" ) );
     }

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java
----------------------------------------------------------------------
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 a9f14fd..e9e5937 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
@@ -55,7 +55,7 @@ public class MavenITmng4618AggregatorBuiltAfterModulesTest
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List mods = verifier.loadLines( "target/log.txt", "UTF-8" );
+        List<String> mods = verifier.loadLines( "target/log.txt", "UTF-8" );
         assertEquals( Arrays.asList( new String[] { "mod-a", "mod-b", "mod-c", "aggregator" } ), mods );
     }
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java
----------------------------------------------------------------------
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 1a6ee7a..9781f47 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
@@ -52,8 +52,8 @@ public class MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.setSystemProperty( "test.prop", "&x=y<>" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java
----------------------------------------------------------------------
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 fe51f78..449382d 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
@@ -49,8 +49,8 @@ public class MavenITmng4633DualCompilerExecutionsWeaveModeTest
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
         verifier.setAutoclean( false );
-        verifier.getCliOptions().add( "-T" );
-        verifier.getCliOptions().add( "2W" );
+        verifier.addCliOption( "-T" );
+        verifier.addCliOption( "2W" );
         verifier.executeGoal( "install" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java
----------------------------------------------------------------------
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 d0386c2..ebf6628 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
@@ -52,8 +52,8 @@ public class MavenITmng4654ArtifactHandlerForMainArtifactTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4654" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java
----------------------------------------------------------------------
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 b639971..c22d400 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
@@ -74,14 +74,14 @@ public class MavenITmng4666CoreRealmImportTest
         verifier.deleteArtifacts( "org.sonatype.spice", "spice-inject-plexus", "0.1-stub" );
         verifier.deleteArtifacts( "classworlds", "classworlds", "0.1-stub" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
         Properties props = verifier.loadProperties( "target/type.properties" );
-        List types = getTypes( props );
+        List<String> types = getTypes( props );
         if ( !matchesVersionRange( "[3.0-beta-4,)" ) )
         {
             // MNG-4725, MNG-4807
@@ -89,17 +89,16 @@ public class MavenITmng4666CoreRealmImportTest
             types.remove( "org.codehaus.plexus.logging.Logger" );
         }
         assertFalse( types.isEmpty() );
-        for ( Iterator it = types.iterator(); it.hasNext(); )
+        for ( String type : types )
         {
-            String type = it.next().toString();
             assertEquals( type, props.get( "plugin." + type ), props.get( "core." + type ) );
         }
     }
 
-    private List getTypes( Properties props )
+    private List<String> getTypes( Properties props )
     {
-        List types = new ArrayList();
-        for ( Iterator it = props.keySet().iterator(); it.hasNext(); )
+        List<String> types = new ArrayList<String>();
+        for ( Iterator<?> it = props.keySet().iterator(); it.hasNext(); )
         {
             String key = it.next().toString();
             if ( key.startsWith( "core." ) )

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java
----------------------------------------------------------------------
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 2e38109..8dc121c 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
@@ -57,7 +57,7 @@ public class MavenITmng4677DisabledPluginConfigInheritanceTest
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List log = verifier.loadLines( "target/log.txt", "UTF-8" );
+        List<String> log = verifier.loadLines( "target/log.txt", "UTF-8" );
         assertEquals( Arrays.asList( new String[] { "parent-only" } ), log );
 
         log = verifier.loadLines( "child-1/target/log.txt", "UTF-8" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java
----------------------------------------------------------------------
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 ca7e2a7..26ef42b 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
@@ -51,8 +51,8 @@ public class MavenITmng4679SnapshotUpdateInPluginTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4679" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
 
         Properties filterProps = verifier.newDefaultFilterProperties();
 
@@ -69,7 +69,7 @@ public class MavenITmng4679SnapshotUpdateInPluginTest
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
         verifier.setLogFileName( "log-force-2.txt" );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-U" );
+        verifier.addCliOption( "-U" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMngtOverridenByProfileTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMngtOverridenByProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMngtOverridenByProfileTest.java
index 8aaa475..76551a2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMngtOverridenByProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMngtOverridenByProfileTest.java
@@ -50,7 +50,7 @@ public class MavenITmng4684DistMngtOverridenByProfileTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-Pmng4684" );
+        verifier.addCliOption( "-Pmng4684" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java
----------------------------------------------------------------------
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 ef10924..d5d7baa 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
@@ -92,14 +92,14 @@ public class MavenITmng4690InterdependentConflictResolutionTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4690" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
+        List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
 
         assertTrue( test + " > " + classpath.toString(), classpath.contains( "a-1.jar" ) );
         assertTrue( test + " > " + classpath.toString(), classpath.contains( "b-1.jar" ) );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java
----------------------------------------------------------------------
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 acb6389..bab45b7 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
@@ -53,8 +53,8 @@ public class MavenITmng4696MavenProjectDependencyArtifactsTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4696" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "initialize" );
         verifier.verifyErrorFreeLog();
@@ -63,7 +63,7 @@ public class MavenITmng4696MavenProjectDependencyArtifactsTest
         Properties props = verifier.loadProperties( "target/artifact.properties" );
         assertEquals( "3", props.getProperty( "project.dependencyArtifacts.size" ) );
 
-        HashSet ids = new HashSet();
+        HashSet<String> ids = new HashSet<String>();
         ids.add( props.getProperty( "project.dependencyArtifacts.0.artifactId" ) );
         ids.add( props.getProperty( "project.dependencyArtifacts.1.artifactId" ) );
         ids.add( props.getProperty( "project.dependencyArtifacts.2.artifactId" ) );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java
----------------------------------------------------------------------
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 0dfad8f..4e25214 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
@@ -51,14 +51,14 @@ public class MavenITmng4720DependencyManagementExclusionMergeTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4720" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
+        List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
 
         assertTrue( classpath.toString(), classpath.contains( "a-0.1.jar" ) );
         assertTrue( classpath.toString(), classpath.contains( "c-0.1.jar" ) );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java
----------------------------------------------------------------------
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 af53220..eb9e854 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
@@ -50,8 +50,8 @@ public class MavenITmng4721OptionalPluginDependencyTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4721" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java
----------------------------------------------------------------------
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 46c3221..b6cb95f 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
@@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
 import java.util.Properties;
 
 import org.mortbay.jetty.Server;
@@ -97,8 +95,8 @@ public class MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest
             Properties filterProps = verifier.newDefaultFilterProperties();
             filterProps.setProperty( "@port@", Integer.toString( server.getConnectors()[0].getLocalPort() ) );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-            verifier.getCliOptions().add( "-s" );
-            verifier.getCliOptions().add( "settings.xml" );
+            verifier.addCliOption( "-s" );
+            verifier.addCliOption( "settings.xml" );
             verifier.executeGoal( "validate" );
             verifier.verifyErrorFreeLog();
             verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java
----------------------------------------------------------------------
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 1efd8ac..59ab072 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
@@ -51,8 +51,8 @@ public class MavenITmng4745PluginVersionUpdateTest
         verifier.setAutoclean( false );
         verifier.setForkJvm( true );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4745" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         Properties filterProps = verifier.newDefaultFilterProperties();
         filterProps.setProperty( "@updates@", "always" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
@@ -84,8 +84,8 @@ public class MavenITmng4745PluginVersionUpdateTest
         verifier.setAutoclean( false );
         verifier.setForkJvm( true );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4745" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         Properties filterProps = verifier.newDefaultFilterProperties();
         filterProps.setProperty( "@updates@", "never" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
@@ -117,9 +117,9 @@ public class MavenITmng4745PluginVersionUpdateTest
         verifier.setAutoclean( false );
         verifier.setForkJvm( true );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4745" );
-        verifier.getCliOptions().add( "-U" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-U" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         Properties filterProps = verifier.newDefaultFilterProperties();
         filterProps.setProperty( "@updates@", "never" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java
----------------------------------------------------------------------
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 6cf1ce4..b988516 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
@@ -52,8 +52,8 @@ public class MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4750" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "initialize" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java
----------------------------------------------------------------------
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 a23a5df..08a4021 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
@@ -61,14 +61,14 @@ public class MavenITmng4755FetchRemoteMetadataForVersionRangeTest
         verifier = newVerifier( new File( testDir, "test" ).getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List cp = verifier.loadLines( "target/classpath.txt", "UTF-8" );
+        List<String> cp = verifier.loadLines( "target/classpath.txt", "UTF-8" );
         assertTrue( cp.toString(), cp.contains( "dep-1.jar" ) );
     }
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java
----------------------------------------------------------------------
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 9ca8b46..bc090ee 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
@@ -54,8 +54,8 @@ public class MavenITmng4761PluginLevelDependencyScopesTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4761" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java
----------------------------------------------------------------------
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 4438804..dd07525 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
@@ -93,14 +93,14 @@ public class MavenITmng4768NearestMatchConflictResolutionTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4768" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
+        List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
 
         assertTrue( test + " > " + classpath.toString(), classpath.contains( "a-2.0.jar" ) );
         assertTrue( test + " > " + classpath.toString(), classpath.contains( "b-0.1.jar" ) );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java
----------------------------------------------------------------------
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 362e2b4..10ec813 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
@@ -61,7 +61,7 @@ public class MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4771" );
 
-        final List requestedUris = Collections.synchronizedList( new ArrayList() );
+        final List<String> requestedUris = Collections.synchronizedList( new ArrayList<String>() );
 
         AbstractHandler logHandler = new AbstractHandler()
         {
@@ -88,9 +88,9 @@ public class MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest
             Properties filterProps = verifier.newDefaultFilterProperties();
             filterProps.setProperty( "@port@", Integer.toString( server.getConnectors()[0].getLocalPort() ) );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-            verifier.getCliOptions().add( "-U" );
-            verifier.getCliOptions().add( "-s" );
-            verifier.getCliOptions().add( "settings.xml" );
+            verifier.addCliOption( "-U" );
+            verifier.addCliOption( "-s" );
+            verifier.addCliOption( "settings.xml" );
             verifier.executeGoal( "mng4771:touch" );
             verifier.verifyErrorFreeLog();
             fail( "Build should have failed to resolve unknown prefix" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java
----------------------------------------------------------------------
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 330343d..9991f44 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
@@ -61,7 +61,7 @@ public class MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4772" );
 
-        final List requestedUris = Collections.synchronizedList( new ArrayList() );
+        final List<String> requestedUris = Collections.synchronizedList( new ArrayList<String>() );
 
         AbstractHandler logHandler = new AbstractHandler()
         {
@@ -88,9 +88,9 @@ public class MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest
             Properties filterProps = verifier.newDefaultFilterProperties();
             filterProps.setProperty( "@port@", Integer.toString( server.getConnectors()[0].getLocalPort() ) );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-            verifier.getCliOptions().add( "-U" );
-            verifier.getCliOptions().add( "-s" );
-            verifier.getCliOptions().add( "settings.xml" );
+            verifier.addCliOption( "-U" );
+            verifier.addCliOption( "-s" );
+            verifier.addCliOption( "settings.xml" );
             verifier.executeGoal( "org.apache.maven.its.mng4772:maven-it-plugin:touch" );
             verifier.verifyErrorFreeLog();
             fail( "Build should have failed to resolve version for unknown plugin" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java
----------------------------------------------------------------------
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 6ac95cc..9bead48 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
@@ -56,7 +56,7 @@ public class MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List classpath = verifier.loadLines( "test/target/classpath.txt", "UTF-8" );
+        List<String> classpath = verifier.loadLines( "test/target/classpath.txt", "UTF-8" );
 
         assertEquals( classpath.toString(), 4, classpath.size() );
     }

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java
----------------------------------------------------------------------
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 6b53d2f..71dbdc9 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
@@ -50,9 +50,9 @@ public class MavenITmng4781DeploymentToNexusStagingRepoTest
 
     private int port;
 
-    private List requestedUris = Collections.synchronizedList( new ArrayList() );
+    private List<String> requestedUris = Collections.synchronizedList( new ArrayList<String>() );
 
-    private List deployedUris = Collections.synchronizedList( new ArrayList() );
+    private List<String> deployedUris = Collections.synchronizedList( new ArrayList<String>() );
 
     public MavenITmng4781DeploymentToNexusStagingRepoTest()
     {
@@ -132,7 +132,7 @@ public class MavenITmng4781DeploymentToNexusStagingRepoTest
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
-        verifier.getCliOptions().add( "-DdeploymentPort=" + port );
+        verifier.addCliOption( "-DdeploymentPort=" + port );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java
----------------------------------------------------------------------
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 adc7f32..3a27492 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
@@ -52,8 +52,8 @@ public class MavenITmng4785TransitiveResolutionInForkedThreadTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4785" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java
----------------------------------------------------------------------
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 183afa4..9eda8ff 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
@@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
-import java.util.List;
-import java.util.Properties;
 
 /**
  * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4788">MNG-4788</a>.

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java
----------------------------------------------------------------------
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 e853421..6596fa1 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
@@ -24,7 +24,6 @@ import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
 import java.util.List;
-import java.util.Properties;
 
 /**
  * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4789">MNG-4789</a>.
@@ -53,24 +52,24 @@ public class MavenITmng4789ScopeInheritanceMeetsConflictTest
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4789" );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
+        List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
         assertFalse( compile.toString(), compile.contains( "a-0.1.jar" ) );
         assertTrue( compile.toString(), compile.contains( "b-0.1.jar" ) );
         assertFalse( compile.toString(), compile.contains( "x-0.1.jar" ) );
 
-        List runtime = verifier.loadLines( "target/runtime.txt", "UTF-8" );
+        List<String> runtime = verifier.loadLines( "target/runtime.txt", "UTF-8" );
         assertFalse( runtime.toString(), runtime.contains( "a-0.1.jar" ) );
         assertTrue( runtime.toString(), runtime.contains( "b-0.1.jar" ) );
         assertFalse( runtime.toString(), runtime.contains( "x-0.1.jar" ) );
 
-        List test = verifier.loadLines( "target/test.txt", "UTF-8" );
+        List<String> test = verifier.loadLines( "target/test.txt", "UTF-8" );
         assertTrue( test.toString(), test.contains( "a-0.1.jar" ) );
         assertTrue( test.toString(), test.contains( "b-0.1.jar" ) );
         assertTrue( test.toString(), test.contains( "x-0.1.jar" ) );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java
----------------------------------------------------------------------
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 caefe31..b1967a3 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
@@ -52,8 +52,8 @@ public class MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4791" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java
----------------------------------------------------------------------
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 5977ec7..150a7e8 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
@@ -24,7 +24,6 @@ import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
 import java.util.List;
-import java.util.Properties;
 
 /**
  * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4795">MNG-4795</a>.
@@ -57,10 +56,10 @@ public class MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List compile0 = verifier.loadLines( "sub/target/compile-0.txt", "UTF-8" );
+        List<String> compile0 = verifier.loadLines( "sub/target/compile-0.txt", "UTF-8" );
         assertTrue( compile0.toString(), compile0.contains( "maven-core-it-support-1.0.jar" ) );
 
-        List compile1 = verifier.loadLines( "sub/target/compile-1.txt", "UTF-8" );
+        List<String> compile1 = verifier.loadLines( "sub/target/compile-1.txt", "UTF-8" );
         assertTrue( compile1.toString(), compile1.contains( "maven-core-it-support-1.0.jar" ) );
     }
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java
----------------------------------------------------------------------
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 30b5a0b..f148a92 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
@@ -65,14 +65,14 @@ public class MavenITmng4800NearestWinsVsScopeWideningTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4800" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
+        List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
 
         assertTrue( test + " > " + compile.toString(), compile.contains( "b-0.1.jar" ) );
         assertTrue( test + " > " + compile.toString(), compile.contains( "c-0.1.jar" ) );
@@ -82,7 +82,7 @@ public class MavenITmng4800NearestWinsVsScopeWideningTest
         assertFalse( test + " > " + compile.toString(), compile.contains( "s-0.2.jar" ) );
         assertFalse( test + " > " + compile.toString(), compile.contains( "y-0.1.jar" ) );
 
-        List runtime = verifier.loadLines( "target/runtime.txt", "UTF-8" );
+        List<String> runtime = verifier.loadLines( "target/runtime.txt", "UTF-8" );
 
         assertTrue( test + " > " + runtime.toString(), runtime.contains( "b-0.1.jar" ) );
         assertTrue( test + " > " + runtime.toString(), runtime.contains( "c-0.1.jar" ) );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java
----------------------------------------------------------------------
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 488d07f..3bb3579 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
@@ -54,17 +54,17 @@ public class MavenITmng4814ReResolutionOfDependenciesDuringReactorTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "consumer/target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4814" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        List goals = new ArrayList();
+        List<String> goals = new ArrayList<String>();
         goals.add( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:aggregate-test" );
         goals.add( "validate" );
         verifier.executeGoals( goals );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List compile = verifier.loadLines( "consumer/target/compile.txt", "UTF-8" );
+        List<String> compile = verifier.loadLines( "consumer/target/compile.txt", "UTF-8" );
 
         assertFalse( compile.toString(), compile.contains( "0.1-SNAPSHOT/producer-0.1-SNAPSHOT.jar" ) );
         assertTrue( compile.toString(), compile.contains( "producer/pom.xml" ) );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java
----------------------------------------------------------------------
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 ec4d0ba..a9a72a4 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
@@ -23,7 +23,6 @@ import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
-import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -52,21 +51,19 @@ public class MavenITmng4829ChecksumFailureWarningTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4829" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List lines = verifier.loadFile( new File( testDir, verifier.getLogFileName() ), false );
+        List<String> lines = verifier.loadFile( new File( testDir, verifier.getLogFileName() ), false );
 
         boolean foundWarningJar = false, foundWarningPom = false;
 
-        for ( Iterator it = lines.iterator(); it.hasNext(); )
+        for ( String line : lines )
         {
-            String line = (String) it.next();
-            
             if ( line.matches( "(?i)\\[WARNING\\].*Checksum.*failed.*fa23720355eead3906fdf4ffd2a1a5f5.*" ) )
             {
                 foundWarningPom = true;

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java
----------------------------------------------------------------------
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 abec9c0..225d66e 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
@@ -52,8 +52,8 @@ public class MavenITmng4834ParentProjectResolvedFromRemoteReposTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4834" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java
----------------------------------------------------------------------
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 124d13b..4d9ad5f 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
@@ -50,8 +50,8 @@ public class MavenITmng4840MavenPrerequisiteTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4840" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         try
         {
@@ -82,8 +82,8 @@ public class MavenITmng4840MavenPrerequisiteTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4840" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        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.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java
----------------------------------------------------------------------
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 bbcf26f..0fb48c7 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
@@ -53,14 +53,14 @@ public class MavenITmng4842ParentResolutionOfDependencyPomTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4842" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
+        List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
 
         assertTrue( compile.toString(), compile.contains( "dep-0.1.jar" ) );
         verifier.assertArtifactPresent( "org.apache.maven.its.mng4842", "parent", "0.1", "pom" );
@@ -80,8 +80,8 @@ public class MavenITmng4842ParentResolutionOfDependencyPomTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4842" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java
----------------------------------------------------------------------
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 0eb9211..07eb939 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
@@ -55,7 +55,7 @@ public class MavenITmng4872ReactorResolutionAttachedWithExclusionsTest
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List artifacts = verifier.loadLines( "consumer/target/artifacts.txt", "UTF-8" );
+        List<String> artifacts = verifier.loadLines( "consumer/target/artifacts.txt", "UTF-8" );
 
         assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4872:producer:jar:0.1" ) );
         assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4872:producer:jar:shaded:0.1" ) );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java
----------------------------------------------------------------------
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 0680744..fc61392 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
@@ -50,8 +50,8 @@ public class MavenITmng4877DeployUsingPrivateKeyTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java
----------------------------------------------------------------------
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 edde976..420adcf 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
@@ -50,8 +50,8 @@ public class MavenITmng4883FailUponOverconstrainedVersionRangesTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4883" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         try
         {

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java
----------------------------------------------------------------------
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 e77e00a..978fea4 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
@@ -52,9 +52,9 @@ public class MavenITmng4890MakeLikeReactorConsidersVersionsTest
         verifier.deleteDirectory( "target" );
         verifier.deleteDirectory( "mod-a/target" );
         verifier.deleteDirectory( "mod-b/target" );
-        verifier.getCliOptions().add( "--projects" );
-        verifier.getCliOptions().add( "mod-b" );
-        verifier.getCliOptions().add( "--also-make" );
+        verifier.addCliOption( "--projects" );
+        verifier.addCliOption( "mod-b" );
+        verifier.addCliOption( "--also-make" );
         verifier.setLogFileName( "log-am.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -79,9 +79,9 @@ public class MavenITmng4890MakeLikeReactorConsidersVersionsTest
         verifier.deleteDirectory( "target" );
         verifier.deleteDirectory( "mod-a/target" );
         verifier.deleteDirectory( "mod-b/target" );
-        verifier.getCliOptions().add( "--projects" );
-        verifier.getCliOptions().add( "mod-a" );
-        verifier.getCliOptions().add( "--also-make-dependents" );
+        verifier.addCliOption( "--projects" );
+        verifier.addCliOption( "mod-a" );
+        verifier.addCliOption( "--also-make-dependents" );
         verifier.setLogFileName( "log-amd.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java
----------------------------------------------------------------------
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 b293e5b..2a38034 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
@@ -63,7 +63,7 @@ public class MavenITmng4891RobustSnapshotResolutionTest
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
+        List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
 
         assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4891:producer:jar:0.1-SNAPSHOT" ) );
     }

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java
----------------------------------------------------------------------
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 b609923..d07387b 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
@@ -51,8 +51,8 @@ public class MavenITmng4895PluginDepWithNonRelocatedMavenApiTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4895" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java
----------------------------------------------------------------------
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 406434a..d2fcf94 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
@@ -52,14 +52,14 @@ public class MavenITmng4913UserPropertyVsDependencyPomPropertyTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4913" );
         verifier.setSystemProperty( "mng4913.version", "98.76" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
+        List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
 
         assertTrue( classpath.toString(), classpath.contains( "a-0.1.jar" ) );
         assertTrue( classpath.toString(), classpath.contains( "b-0.1.jar" ) );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java
----------------------------------------------------------------------
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 46dd668..aba357b 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
@@ -55,7 +55,7 @@ public class MavenITmng4919LifecycleMappingWithSameGoalTwiceTest
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List lines = verifier.loadLines( "target/log.txt", "UTF-8" );
+        List<String> lines = verifier.loadLines( "target/log.txt", "UTF-8" );
         assertEquals( Arrays.asList( new String[] { "check", "check" } ), lines );
     }
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java
----------------------------------------------------------------------
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 690a581..bdcdeb4 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
@@ -51,8 +51,8 @@ public class MavenITmng4925ContainerLookupRealmDuringMojoExecTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4925" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java
----------------------------------------------------------------------
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 2883abf..2de5f04 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
@@ -52,12 +52,12 @@ public class MavenITmng4936EventSpyTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.setSystemProperty( "maven.ext.class.path", "spy-0.1.jar" );
-        verifier.getCliOptions().add( "-X" );
+        verifier.addCliOption( "-X" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List lines = verifier.loadLines( "target/spy.log", "UTF-8" );
+        List<String> lines = verifier.loadLines( "target/spy.log", "UTF-8" );
         assertTrue( lines.toString(), lines.get( 0 ).toString().startsWith( "init" ) );
         assertTrue( lines.toString(), lines.get( lines.size() - 1 ).toString().startsWith( "close" ) );
         assertTrue( lines.toString(), 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java
----------------------------------------------------------------------
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 17a64dd..52bfaf1 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
@@ -59,14 +59,14 @@ public class MavenITmng4955LocalVsRemoteSnapshotResolutionTest
         verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
+        List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
 
         File jarFile = new File( classpath.get( 1 ).toString() );
         assertEquals( "eeff09b1b80e823eeb2a615b1d4b09e003e86fd3", ItUtils.calcHash( jarFile, "SHA-1" ) );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java
----------------------------------------------------------------------
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 f13d15a..d918ebd 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
@@ -52,11 +52,11 @@ public class MavenITmng4960MakeLikeReactorResumeTest
         verifier.deleteDirectory( "target" );
         verifier.deleteDirectory( "mod-a/target" );
         verifier.deleteDirectory( "mod-b/target" );
-        verifier.getCliOptions().add( "--projects" );
-        verifier.getCliOptions().add( "mod-b" );
-        verifier.getCliOptions().add( "--also-make" );
-        verifier.getCliOptions().add( "--resume-from" );
-        verifier.getCliOptions().add( "mod-a" );
+        verifier.addCliOption( "--projects" );
+        verifier.addCliOption( "mod-b" );
+        verifier.addCliOption( "--also-make" );
+        verifier.addCliOption( "--resume-from" );
+        verifier.addCliOption( "mod-a" );
         verifier.setLogFileName( "log-up.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -81,11 +81,11 @@ public class MavenITmng4960MakeLikeReactorResumeTest
         verifier.deleteDirectory( "target" );
         verifier.deleteDirectory( "mod-a/target" );
         verifier.deleteDirectory( "mod-b/target" );
-        verifier.getCliOptions().add( "--projects" );
-        verifier.getCliOptions().add( "mod-a" );
-        verifier.getCliOptions().add( "--also-make-dependents" );
-        verifier.getCliOptions().add( "--resume-from" );
-        verifier.getCliOptions().add( "mod-b" );
+        verifier.addCliOption( "--projects" );
+        verifier.addCliOption( "mod-a" );
+        verifier.addCliOption( "--also-make-dependents" );
+        verifier.addCliOption( "--resume-from" );
+        verifier.addCliOption( "mod-b" );
         verifier.setLogFileName( "log-down.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();


[3/6] replaced verifier.getCliOptions().add() with verifier.addCliOption()

Posted by hb...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java
----------------------------------------------------------------------
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 8bc9155..4c6d4f1 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
@@ -50,7 +50,7 @@ public class MavenITmng4208InterpolationPrefersCliOverProjectPropsTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-DtestProperty=PASSED" );
+        verifier.addCliOption( "-DtestProperty=PASSED" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java
----------------------------------------------------------------------
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 eb9044e..740ba60 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
@@ -23,9 +23,6 @@ import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 
 /**
  * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4214">MNG-4214</a>.
@@ -56,8 +53,8 @@ public class MavenITmng4214MirroredParentSearchReposTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4214" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java
----------------------------------------------------------------------
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 93120a4..812e79e 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
@@ -50,8 +50,8 @@ public class MavenITmng4231SnapshotUpdatePolicyTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4231" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
 
         Properties filterProps = verifier.newDefaultFilterProperties();
         filterProps.setProperty( "@updates@", "always" );
@@ -87,8 +87,8 @@ public class MavenITmng4231SnapshotUpdatePolicyTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4231" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
 
         Properties filterProps = verifier.newDefaultFilterProperties();
         filterProps.setProperty( "@updates@", "never" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java
----------------------------------------------------------------------
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 c8794b2..39f21e0 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
@@ -135,8 +135,8 @@ public class MavenITmng4235HttpAuthDeploymentChecksumsTest
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4235" );
         verifier.deleteDirectory( "repo" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java
index 7f92c8b..2dad450 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java
@@ -50,8 +50,8 @@ public class MavenITmng4254SelectableWagonProvidersTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
 
-        verifier.getCliOptions().add( "-Dmaven.wagon.provider.http=coreit" );
-        verifier.getCliOptions().add( "-V" );
+        verifier.addCliOption( "-Dmaven.wagon.provider.http=coreit" );
+        verifier.addCliOption( "-V" );
 
         verifier.setLogFileName( "log-cli.txt" );
         verifier.executeGoal( "validate" );
@@ -72,9 +72,9 @@ public class MavenITmng4254SelectableWagonProvidersTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
 
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
-        verifier.getCliOptions().add( "-V" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
+        verifier.addCliOption( "-V" );
         
         verifier.setLogFileName( "log-settings.txt" );
         verifier.executeGoal( "validate" );
@@ -95,7 +95,7 @@ public class MavenITmng4254SelectableWagonProvidersTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
 
-        verifier.getCliOptions().add( "-V" );
+        verifier.addCliOption( "-V" );
         
         verifier.setLogFileName( "log-default-http.txt" );
         verifier.executeGoal( "validate" );
@@ -116,8 +116,8 @@ public class MavenITmng4254SelectableWagonProvidersTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
 
-        verifier.getCliOptions().add( "-V" );
-        verifier.getCliOptions().add( "-DwagonProtocol=https" );
+        verifier.addCliOption( "-V" );
+        verifier.addCliOption( "-DwagonProtocol=https" );
         
         verifier.setLogFileName( "log-default-https.txt" );
         verifier.executeGoal( "validate" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java
----------------------------------------------------------------------
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 d8a680e..33b0e07 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
@@ -56,8 +56,8 @@ public class MavenITmng4262MakeLikeReactorDottedPathTest
         Verifier verifier = newVerifier( new File( testDir, "parent" ).getAbsolutePath() );
         verifier.setAutoclean( false );
         clean( verifier );
-        verifier.getCliOptions().add( "-pl" );
-        verifier.getCliOptions().add( "." );
+        verifier.addCliOption( "-pl" );
+        verifier.addCliOption( "." );
         verifier.setLogFileName( "log-root.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -78,8 +78,8 @@ public class MavenITmng4262MakeLikeReactorDottedPathTest
         Verifier verifier = newVerifier( new File( testDir, "parent" ).getAbsolutePath() );
         verifier.setAutoclean( false );
         clean( verifier );
-        verifier.getCliOptions().add( "-pl" );
-        verifier.getCliOptions().add( "../sub-a" );
+        verifier.addCliOption( "-pl" );
+        verifier.addCliOption( "../sub-a" );
         verifier.setLogFileName( "log-module.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java
----------------------------------------------------------------------
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 fd436ca..587928f 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
@@ -56,8 +56,8 @@ public class MavenITmng4269BadReactorResolutionFromOutDirTest
         new File( testDir, "target/classes" ).mkdirs();
         verifier.deleteArtifacts( "org.apache.maven.its.mng4269" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        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.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java
----------------------------------------------------------------------
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 88a41d9..845639a 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
@@ -57,8 +57,8 @@ public class MavenITmng4274PluginRealmArtifactsTest
         verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "1.1.4274", "jar" );
         verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "1.1.4274", "pom" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java
----------------------------------------------------------------------
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 757baf0..8825006 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
@@ -51,8 +51,8 @@ public class MavenITmng4275RelocationWarningTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4275" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java
----------------------------------------------------------------------
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 d28ccfc..f734b23 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
@@ -55,8 +55,8 @@ public class MavenITmng4276WrongTransitivePlexusUtilsTest
         verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "1.1.4276", "jar" );
         verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "1.1.4276", "pom" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java
index 6de4511..71f166f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java
@@ -49,8 +49,8 @@ public class MavenITmng4279WagonProviderFailoverTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java
----------------------------------------------------------------------
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 60f6132..a1d9b2d 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
@@ -61,8 +61,8 @@ public class MavenITmng4281PreferLocalSnapshotTest
 
         verifier = newVerifier( new File( testDir, "project" ).getAbsolutePath() );
         verifier.setAutoclean( false );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java
----------------------------------------------------------------------
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 b8cbbf6..8dceb8c 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
@@ -51,7 +51,7 @@ public class MavenITmng4291MojoRequiresOnlineModeTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.setLogFileName( "log-direct.txt" );
-        verifier.getCliOptions().add( "--offline" );
+        verifier.addCliOption( "--offline" );
         try
         {
             verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-online:2.1-SNAPSHOT:touch" );
@@ -81,7 +81,7 @@ public class MavenITmng4291MojoRequiresOnlineModeTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.setLogFileName( "log-lifecycle.txt" );
-        verifier.getCliOptions().add( "--offline" );
+        verifier.addCliOption( "--offline" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java
----------------------------------------------------------------------
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 72746cb..ed3947b 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
@@ -59,8 +59,8 @@ public class MavenITmng4293RequiresCompilePlusRuntimeScopeTest
         Properties filterProps = verifier.newDefaultFilterProperties();
         verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", filterProps );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java
----------------------------------------------------------------------
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 37573d3..7f16c27 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
@@ -52,7 +52,7 @@ public class MavenITmng4309StrictChecksumValidationForMetadataTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4309" );
         FileUtils.copyDirectoryStructure( new File( testDir, "repo" ), new File( testDir, "target/repo" ) );
-        verifier.getCliOptions().add( "--strict-checksums" );
+        verifier.addCliOption( "--strict-checksums" );
         try
         {
           verifier.executeGoal( "validate" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java
----------------------------------------------------------------------
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 6f38758..7ca76ac 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
@@ -51,8 +51,8 @@ public class MavenITmng4317PluginVersionResolutionFromMultiReposTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4317" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        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.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java
----------------------------------------------------------------------
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 d6a5db3..e5d45a6 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
@@ -52,8 +52,8 @@ public class MavenITmng4320AggregatorAndDependenciesTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4320" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        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.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java
----------------------------------------------------------------------
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 ee9944e..30b3aa0 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
@@ -144,8 +144,8 @@ public class MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest
             Properties filterProps = verifier.newDefaultFilterProperties();
             filterProps.setProperty( "@port@", Integer.toString( server.getConnectors()[0].getLocalPort() ) );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-            verifier.getCliOptions().add( "--settings" );
-            verifier.getCliOptions().add( "settings.xml" );
+            verifier.addCliOption( "--settings" );
+            verifier.addCliOption( "settings.xml" );
             verifier.setLogFileName( "log-daily.txt" );
             verifier.deleteDirectory( "target" );
             verifier.executeGoal( "validate" );
@@ -160,7 +160,7 @@ public class MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest
             uris.clear();
 
             // test 2: force snapshot updates, remote metadata and artifacts should be fetched
-            verifier.getCliOptions().add( "-U" );
+            verifier.addCliOption( "-U" );
             verifier.setLogFileName( "log-force.txt" );
             verifier.deleteDirectory( "target" );
             verifier.executeGoal( "validate" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java
----------------------------------------------------------------------
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 67b688d..686e3a2 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
@@ -52,7 +52,7 @@ public class MavenITmng4328PrimitiveMojoParameterConfigurationTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "--offline" );
+        verifier.addCliOption( "--offline" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java
----------------------------------------------------------------------
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 48a1aa1..8d9a70e 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
@@ -76,7 +76,7 @@ public class MavenITmng4331DependencyCollectionTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4331" );
-        verifier.getCliOptions().add( "-Ddepres.projectArtifacts=target/@artifactId@.txt" );
+        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.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java
----------------------------------------------------------------------
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 c94dc47..3d9af86 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
@@ -50,8 +50,8 @@ public class MavenITmng4335SettingsOfflineModeTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4335" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         try
         {

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java
----------------------------------------------------------------------
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 848821d..abd7f5b 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
@@ -138,8 +138,8 @@ public class MavenITmng4343MissingReleaseUpdatePolicyTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4343" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
 
         Properties filterProps = verifier.newDefaultFilterProperties();
         filterProps.setProperty( "@updates@", "always" );
@@ -190,8 +190,8 @@ public class MavenITmng4343MissingReleaseUpdatePolicyTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4343" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
 
         Properties filterProps = verifier.newDefaultFilterProperties();
         filterProps.setProperty( "@updates@", "never" );
@@ -235,7 +235,7 @@ public class MavenITmng4343MissingReleaseUpdatePolicyTest
         verifier.assertArtifactNotPresent( "org.apache.maven.its.mng4343", "dep", "0.1", "pom" );
 
         verifier.setLogFileName( "log-never-3.txt" );
-        verifier.getCliOptions().add( "-U" );
+        verifier.addCliOption( "-U" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
 
@@ -247,7 +247,7 @@ public class MavenITmng4343MissingReleaseUpdatePolicyTest
         requestedUris.clear();
 
         verifier.setLogFileName( "log-never-4.txt" );
-        verifier.getCliOptions().add( "-U" );
+        verifier.addCliOption( "-U" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java
----------------------------------------------------------------------
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 7b8afcf..e5f1951 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
@@ -55,8 +55,8 @@ public class MavenITmng4347ImportScopeWithSettingsProfilesTest
         
         verifier.setAutoclean( false );
         
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java
----------------------------------------------------------------------
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 0e6991a..4410b1f 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
@@ -99,8 +99,8 @@ public class MavenITmng4348NoUnnecessaryRepositoryAccessTest
             Properties filterProps = verifier.newDefaultFilterProperties();
             filterProps.setProperty( "@port@", Integer.toString( port ) );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-            verifier.getCliOptions().add( "--settings" );
-            verifier.getCliOptions().add( "settings.xml" );
+            verifier.addCliOption( "--settings" );
+            verifier.addCliOption( "settings.xml" );
             verifier.executeGoal( "validate" );
             verifier.verifyErrorFreeLog();
             verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java
----------------------------------------------------------------------
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 ff2ca26..ee6af50 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
@@ -54,8 +54,8 @@ public class MavenITmng4349RelocatedArtifactWithInvalidPomTest
         verifier.deleteArtifacts( "org.apache.maven.its.mng4349" );
         verifier.deleteDirectory( "target" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java
----------------------------------------------------------------------
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 57fe3a0..7813d83 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
@@ -55,8 +55,8 @@ public class MavenITmng4353PluginDependencyResolutionFromPomRepoTest
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
         verifier.filterFile( "repo-1/org/apache/maven/its/mng4353/maven-mng4353-plugin/0.1/template.pom", 
             "repo-1/org/apache/maven/its/mng4353/maven-mng4353-plugin/0.1/maven-mng4353-plugin-0.1.pom", "UTF-8", filterProps );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java
----------------------------------------------------------------------
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 1a1da5e..7e20b6b 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
@@ -53,8 +53,8 @@ public class MavenITmng4355ExtensionAutomaticVersionResolutionTest
         verifier.deleteArtifacts( "org.apache.maven.its.mng4355" );
         Properties filterProps = verifier.newDefaultFilterProperties();
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java
----------------------------------------------------------------------
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 5a92a8a..e15131e 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
@@ -56,8 +56,8 @@ public class MavenITmng4357LifecycleMappingDiscoveryInReactorTest
         verifier.deleteArtifacts( "org.apache.maven.its.mng4357" );
         Properties filterProps = verifier.newDefaultFilterProperties();
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java
----------------------------------------------------------------------
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 09605fc..75c0e2c 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
@@ -128,8 +128,8 @@ public class MavenITmng4360WebDavSupportTest
             Properties filterProps = verifier.newDefaultFilterProperties();
             filterProps.setProperty( "@port@", Integer.toString( port ) );
             verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", filterProps );
-            verifier.getCliOptions().add( "--settings" );
-            verifier.getCliOptions().add( "settings.xml" );
+            verifier.addCliOption( "--settings" );
+            verifier.addCliOption( "settings.xml" );
             verifier.executeGoal( "validate" );
             verifier.verifyErrorFreeLog();
             verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java
----------------------------------------------------------------------
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 26e859a..30048e5 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
@@ -51,8 +51,8 @@ public class MavenITmng4361ForceDependencySnapshotUpdateTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4361" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
 
         Properties filterProps = verifier.newDefaultFilterProperties();
 
@@ -68,7 +68,7 @@ public class MavenITmng4361ForceDependencySnapshotUpdateTest
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
         verifier.setLogFileName( "log-force-2.txt" );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-U" );
+        verifier.addCliOption( "-U" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java
----------------------------------------------------------------------
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 e573950..20b6bba 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
@@ -52,8 +52,8 @@ public class MavenITmng4363DynamicAdditionOfDependencyArtifactTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4363" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "generate-sources" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java
----------------------------------------------------------------------
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 e1ee2fc..45b7dc0 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
@@ -57,8 +57,8 @@ public class MavenITmng4367LayoutAwareMirrorSelectionTest
         filterProps.setProperty( "@mirrorurl@", filterProps.getProperty( "@baseurl@" ) + "/repo" );
         filterProps.setProperty( "@layouts@", "" );
 
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings-a.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings-a.xml" );
         verifier.filterFile( "settings-template.xml", "settings-a.xml", "UTF-8", filterProps );
         verifier.setLogFileName( "log-a.txt" );
         verifier.executeGoal( "validate" );
@@ -85,8 +85,8 @@ public class MavenITmng4367LayoutAwareMirrorSelectionTest
         filterProps.setProperty( "@mirrorurl@", filterProps.getProperty( "@baseurl@" ) + "/repo" );
         filterProps.setProperty( "@layouts@", "default,legacy" );
 
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings-b.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings-b.xml" );
         verifier.filterFile( "settings-template.xml", "settings-b.xml", "UTF-8", filterProps );
         verifier.setLogFileName( "log-b.txt" );
         verifier.executeGoal( "validate" );
@@ -113,8 +113,8 @@ public class MavenITmng4367LayoutAwareMirrorSelectionTest
         filterProps.setProperty( "@mirrorurl@", filterProps.getProperty( "@baseurl@" ) + "/void" );
         filterProps.setProperty( "@layouts@", "foo" );
 
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings-c.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings-c.xml" );
         verifier.filterFile( "settings-template.xml", "settings-c.xml", "UTF-8", filterProps );
         verifier.setLogFileName( "log-c.txt" );
         verifier.executeGoal( "validate" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java
----------------------------------------------------------------------
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 c1f7e6b..293c7d3 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
@@ -54,8 +54,8 @@ public class MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4379" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate", Collections.singletonMap( "MNG_4379_HOME", testDir.getAbsolutePath() ) );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java
----------------------------------------------------------------------
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 82a8875..8ac79be 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
@@ -23,7 +23,6 @@ import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
-import java.util.List;
 
 /**
  * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4383">MNG-4383</a>.

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java
----------------------------------------------------------------------
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 26e0299..8183491 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
@@ -23,7 +23,6 @@ import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
-import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -51,7 +50,7 @@ public class MavenITmng4386DebugLoggingTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-X" );
+        verifier.addCliOption( "-X" );
         verifier.setLogFileName( "log.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java
----------------------------------------------------------------------
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 09445ed..4950419 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
@@ -51,7 +51,7 @@ public class MavenITmng4387QuietLoggingTest
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
-        verifier.getCliOptions().add( "-q" );
+        verifier.addCliOption( "-q" );
         verifier.setLogFileName( "log.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java
----------------------------------------------------------------------
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 23307c6..2e6a213 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
@@ -51,8 +51,8 @@ public class MavenITmng4393ParseExternalParenPomLenientTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4393" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java
----------------------------------------------------------------------
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 c045e38..67f1267 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
@@ -51,8 +51,8 @@ public class MavenITmng4400RepositoryOrderTest
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4400" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
@@ -73,8 +73,8 @@ public class MavenITmng4400RepositoryOrderTest
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4400" );
         verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java
----------------------------------------------------------------------
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 b231c56..a8981d7 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
@@ -52,8 +52,8 @@ public class MavenITmng4401RepositoryOrderForParentPomTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4401" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java
----------------------------------------------------------------------
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 d1cd7c2..bd0fbbf 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
@@ -49,7 +49,7 @@ public class MavenITmng4402DuplicateChildModuleTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-N" );
+        verifier.addCliOption( "-N" );
         try
         {
             verifier.executeGoal( "validate" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java
----------------------------------------------------------------------
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 8226aee..1a360f3 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
@@ -56,8 +56,8 @@ public class MavenITmng4403LenientDependencyPomParsingTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4403" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
@@ -65,7 +65,7 @@ public class MavenITmng4403LenientDependencyPomParsingTest
         List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
         Collections.sort( artifacts );
 
-        List<String> expected = new ArrayList();
+        List<String> expected = new ArrayList<String>();
         expected.add( "org.apache.maven.its.mng4403:a:jar:0.1" );
         expected.add( "org.apache.maven.its.mng4403:b:jar:0.1" );
         expected.add( "org.apache.maven.its.mng4403:c:jar:0.1" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java
----------------------------------------------------------------------
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 bfff702..a728ac4 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
@@ -49,8 +49,8 @@ public class MavenITmng4408NonExistentSettingsFileTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.setLogFileName( "log-user.txt" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "non-existing-settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "non-existing-settings.xml" );
         try
         {
             verifier.executeGoal( "validate" );
@@ -78,8 +78,8 @@ public class MavenITmng4408NonExistentSettingsFileTest
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.setLogFileName( "log-global.txt" );
-        verifier.getCliOptions().add( "--global-settings" );
-        verifier.getCliOptions().add( "non-existing-settings.xml" );
+        verifier.addCliOption( "--global-settings" );
+        verifier.addCliOption( "non-existing-settings.xml" );
         try
         {
             verifier.executeGoal( "validate" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java
----------------------------------------------------------------------
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 c2d5747..fa21b21 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
@@ -52,10 +52,10 @@ public class MavenITmng4412OfflineModeInPluginTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4412" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-Presolver" );
-        verifier.getCliOptions().add( "--offline" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-Presolver" );
+        verifier.addCliOption( "--offline" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.setLogFileName( "log-resolver.txt" );
         try
         {
@@ -87,10 +87,10 @@ public class MavenITmng4412OfflineModeInPluginTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4412" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-Pcollector" );
-        verifier.getCliOptions().add( "--offline" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-Pcollector" );
+        verifier.addCliOption( "--offline" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.setLogFileName( "log-collector.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java
----------------------------------------------------------------------
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 bdbda4d..12b626a 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
@@ -95,8 +95,8 @@ public class MavenITmng4413MirroringOfDependencyRepoTest
             Properties filterProps = verifier.newDefaultFilterProperties();
             filterProps.setProperty( "@port@", Integer.toString( server.getConnectors()[0].getLocalPort() ) );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-            verifier.getCliOptions().add( "-s" );
-            verifier.getCliOptions().add( "settings.xml" );
+            verifier.addCliOption( "-s" );
+            verifier.addCliOption( "settings.xml" );
             verifier.executeGoal( "validate" );
             verifier.verifyErrorFreeLog();
             verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
----------------------------------------------------------------------
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 af8d7a0..b1cd1be 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
@@ -140,8 +140,8 @@ public class MavenITmng4428FollowHttpRedirectTest
             filterProps.setProperty( "@protocol@", fromHttp ? "http" : "https" );
             filterProps.setProperty( "@port@", Integer.toString( from.getLocalPort() ) );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-            verifier.getCliOptions().add( "-X --settings" );
-            verifier.getCliOptions().add( "settings.xml" );
+            verifier.addCliOption( "-X --settings" );
+            verifier.addCliOption( "settings.xml" );
             verifier.setSystemProperty( "javax.net.ssl.trustStore", storePath );
             verifier.setSystemProperty( "javax.net.ssl.trustStorePassword", storePwd );
             verifier.setLogFileName( "log-" + getName().substring( 6 ) + ".txt" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java
----------------------------------------------------------------------
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 0aaa145..2505289 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
@@ -50,8 +50,8 @@ public class MavenITmng4433ForceParentSnapshotUpdateTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4433" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
 
         Properties filterProps = verifier.newDefaultFilterProperties();
 
@@ -69,7 +69,7 @@ public class MavenITmng4433ForceParentSnapshotUpdateTest
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
         verifier.setLogFileName( "log-force-2.txt" );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-U" );
+        verifier.addCliOption( "-U" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java
----------------------------------------------------------------------
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 a9babb5..2b59b17 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
@@ -51,8 +51,8 @@ public class MavenITmng4450StubModelForMissingDependencyPomTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4450" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java
----------------------------------------------------------------------
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 51e27ca..dda345d 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
@@ -75,8 +75,8 @@ public class MavenITmng4452ResolutionOfSnapshotWithClassifierTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4452" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java
----------------------------------------------------------------------
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 b36f245..0bc61b1 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
@@ -53,8 +53,8 @@ public class MavenITmng4459InMemorySettingsKeptEncryptedTest
         verifier.deleteDirectory( "target" );
         verifier.getSystemProperties().setProperty( "settings.security", 
             new File( testDir, "settings-security.xml" ).getAbsolutePath() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java
----------------------------------------------------------------------
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 b0ec8fd..99949a7 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
@@ -55,8 +55,8 @@ public class MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest
         verifier.deleteArtifacts( "org.apache.maven.its.mng4465" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.setLogFileName( "log1.txt" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "mng4465:touch" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
@@ -71,8 +71,8 @@ public class MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", 
             Collections.singletonMap( "@baseurl@", "bad://localhost:63412" ) );
         verifier.setLogFileName( "log2.txt" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "mng4465:touch" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java
----------------------------------------------------------------------
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 ab78af0..e5b2429 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
@@ -137,8 +137,8 @@ public class MavenITmng4469AuthenticatedDeploymentToCustomRepoTest
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.setSystemProperty( "file", "settings.xml" );
         verifier.setSystemProperty( "groupId", "org.apache.maven.its.mng4469" );
         verifier.setSystemProperty( "artifactId", "it" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java
----------------------------------------------------------------------
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 5cec98e..b8b08a9 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
@@ -209,8 +209,8 @@ public class MavenITmng4470AuthenticatedDeploymentToProxyTest
         verifier.setAutoclean( false );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", 
             Collections.singletonMap( "@port@", Integer.toString( port ) ) );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java
----------------------------------------------------------------------
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 0ee2701..596560e 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
@@ -53,8 +53,8 @@ public class MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4479" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        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.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java
----------------------------------------------------------------------
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 61d6f8d..91d59e2 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
@@ -50,8 +50,8 @@ public class MavenITmng4482ForcePluginSnapshotUpdateTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4482" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
 
         /*
          * NOTE: The update of the extension plugin while still being referenced by a class loader from the first test
@@ -76,8 +76,8 @@ public class MavenITmng4482ForcePluginSnapshotUpdateTest
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
         verifier.setLogFileName( "log-force-2.txt" );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-X" );
-        verifier.getCliOptions().add( "-U" );
+        verifier.addCliOption( "-X" );
+        verifier.addCliOption( "-U" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java
----------------------------------------------------------------------
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 178f8d2..5db527b 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
@@ -51,8 +51,8 @@ public class MavenITmng4488ValidateExternalParenPomLenientTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4488" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java
----------------------------------------------------------------------
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 96644ad..e4076d5 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
@@ -95,8 +95,8 @@ public class MavenITmng4489MirroringOfExtensionRepoTest
             Properties filterProps = verifier.newDefaultFilterProperties();
             filterProps.setProperty( "@port@", Integer.toString( server.getConnectors()[0].getLocalPort() ) );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-            verifier.getCliOptions().add( "-s" );
-            verifier.getCliOptions().add( "settings.xml" );
+            verifier.addCliOption( "-s" );
+            verifier.addCliOption( "settings.xml" );
             verifier.executeGoal( "validate" );
             verifier.verifyErrorFreeLog();
             verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java
----------------------------------------------------------------------
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 be2ee7a..77624d3 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
@@ -52,13 +52,13 @@ public class MavenITmng4498IgnoreBrokenMetadataTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4498" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
+        List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
         assertTrue( classpath.toString(), classpath.contains( "dep-0.1-SNAPSHOT.jar" ) );
     }
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java
----------------------------------------------------------------------
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 6c62262..140ef63 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
@@ -65,7 +65,7 @@ public class MavenITmng4500NoUpdateOfTimestampedSnapshotsTest
         String pomUri = "/repo/org/apache/maven/its/mng4500/dep/0.1-SNAPSHOT/dep-0.1-20091219.230823-1.pom";
         String jarUri = "/repo/org/apache/maven/its/mng4500/dep/0.1-SNAPSHOT/dep-0.1-20091219.230823-1.jar";
 
-        final List requestedUris = Collections.synchronizedList( new ArrayList() );
+        final List<String> requestedUris = Collections.synchronizedList( new ArrayList<String>() );
 
         AbstractHandler logHandler = new AbstractHandler()
         {
@@ -97,14 +97,14 @@ public class MavenITmng4500NoUpdateOfTimestampedSnapshotsTest
             Properties filterProps = verifier.newDefaultFilterProperties();
             filterProps.setProperty( "@port@", Integer.toString( server.getConnectors()[0].getLocalPort() ) );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-            verifier.getCliOptions().add( "-s" );
-            verifier.getCliOptions().add( "settings.xml" );
+            verifier.addCliOption( "-s" );
+            verifier.addCliOption( "settings.xml" );
 
             verifier.setLogFileName( "log-1.txt" );
             verifier.executeGoal( "validate" );
             verifier.verifyErrorFreeLog();
 
-            List classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
+            List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
             assertTrue( classpath.toString(), classpath.contains( "dep-0.1-SNAPSHOT.jar" ) );
             assertTrue( requestedUris.toString(), requestedUris.contains( pomUri ) );
             assertTrue( requestedUris.toString(), requestedUris.contains( jarUri ) );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java
----------------------------------------------------------------------
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 05ff90a..cd0524f 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
@@ -51,8 +51,8 @@ public class MavenITmng4522FailUponMissingDependencyParentPomTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4522" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         try
         {
             verifier.executeGoal( "validate" );


[5/6] replaced verifier.getCliOptions().add() with verifier.addCliOption()

Posted by hb...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java
----------------------------------------------------------------------
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 2240fc8..6785566 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
@@ -52,8 +52,8 @@ public class MavenITmng1703PluginMgmtDepInheritanceTest
         Verifier verifier = newVerifier( new File( testDir, "child" ).getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng1703" );
         verifier.executeGoal( "validate" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java
----------------------------------------------------------------------
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 f4eb4db..f9f05db 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
@@ -64,8 +64,8 @@ public class MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng1751" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java
index 5132b6c..c24a87b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java
@@ -51,7 +51,7 @@ public class MavenITmng1830ShowVersionTest
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
-        verifier.getCliOptions().add( "-X" );
+        verifier.addCliOption( "-X" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java
----------------------------------------------------------------------
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 ac3bfa5..76ed24e 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
@@ -53,8 +53,8 @@ public class MavenITmng1895ScopeConflictResolutionTest
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng1895" );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -216,8 +216,8 @@ public class MavenITmng1895ScopeConflictResolutionTest
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng1895" );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         Properties props = verifier.newDefaultFilterProperties();
         props.setProperty( "@scope.a@", scopeA );
         props.setProperty( "@scope.b@", scopeB );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java
index b80f112..ced05d3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java
@@ -52,8 +52,8 @@ public class MavenITmng1908LegacySnapshotUpdateTest
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng1908" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java
----------------------------------------------------------------------
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 ed107a7..dd446f9 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
@@ -49,8 +49,8 @@ public class MavenITmng2052InterpolateWithSettingsProfilePropertiesTest
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java
----------------------------------------------------------------------
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 09a40f8..118399b 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
@@ -52,8 +52,8 @@ public class MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng2098" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java
----------------------------------------------------------------------
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 bdc44f1..9523c71 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
@@ -47,8 +47,8 @@ public class MavenITmng2123VersionRangeDependencyTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng2123" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
----------------------------------------------------------------------
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 68e2eba..7632e19 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
@@ -53,8 +53,8 @@ public class MavenITmng2136ActiveByDefaultProfileTest
 
         verifier.setSystemProperty( "expression.outputFile", new File( testDir, "target/expression.properties" ).getPath() );
         verifier.setSystemProperty( "expression.expressions", "project/properties" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java
----------------------------------------------------------------------
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 50f5006..dd6bae2 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
@@ -54,8 +54,8 @@ public class MavenITmng2174PluginDepsManagedByParentProfileTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng2174" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java
----------------------------------------------------------------------
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 a5cacab..8f64930 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
@@ -53,8 +53,8 @@ public class MavenITmng2228ComponentInjectionTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng2228" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java
----------------------------------------------------------------------
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 06f71cb..c6545cd 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
@@ -49,8 +49,8 @@ public class MavenITmng2234ActiveProfilesFromSettingsTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
 
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java
----------------------------------------------------------------------
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 3e9d9ec..abafe5f 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
@@ -50,8 +50,8 @@ public class MavenITmng2276ProfileActivationBySettingsPropertyTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.setLogFileName( "log-1.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -73,8 +73,8 @@ public class MavenITmng2276ProfileActivationBySettingsPropertyTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.setSystemProperty( "settingsProperty", "cli" );
         verifier.setLogFileName( "log-2.txt" );
         verifier.executeGoal( "validate" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java
----------------------------------------------------------------------
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 b3f7ac2..6d62ad9 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
@@ -32,7 +32,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
 import org.mortbay.jetty.Request;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.handler.AbstractHandler;
@@ -92,8 +91,8 @@ public class MavenITmng2305MultipleProxiesTest
             filterProps.setProperty( "@proxy.http@", Integer.toString( httpPort ) );
             filterProps.setProperty( "@proxy.https@", Integer.toString( proxyPort ) );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-            verifier.getCliOptions().add( "--settings" );
-            verifier.getCliOptions().add( "settings.xml" );
+            verifier.addCliOption( "--settings" );
+            verifier.addCliOption( "settings.xml" );
             verifier.setSystemProperty( "javax.net.ssl.trustStore", storePath );
             verifier.setSystemProperty( "javax.net.ssl.trustStorePassword", storePwd );
             // disable concurrent downloading as not all wagons (e.g. wagon-lightweight-http) are thread-safe regarding proxy settings

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java
----------------------------------------------------------------------
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 94e5f6b..6cc17c7 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
@@ -50,9 +50,9 @@ public class MavenITmng2309ProfileInjectionOrderTest
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
-        verifier.getCliOptions().add( "-P"
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
+        verifier.addCliOption( "-P"
             + "pom-a,pom-b,pom-e,pom-c,pom-d"
             + ",profiles-a,profiles-b,profiles-e,profiles-c,profiles-d"
             + ",settings-a,settings-b,settings-e,settings-c,settings-d" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java
----------------------------------------------------------------------
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 209cef4..28163f4 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
@@ -47,7 +47,7 @@ public class MavenITmng2339BadProjectInterpolationTest
         verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
 
-        verifier.getCliOptions().add( "-Dversion=foo" );
+        verifier.addCliOption( "-Dversion=foo" );
         verifier.executeGoal( "validate" );
 
         verifier.verifyErrorFreeLog();
@@ -79,7 +79,7 @@ public class MavenITmng2339BadProjectInterpolationTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
 
-        verifier.getCliOptions().add( "-Dversion=2" );
+        verifier.addCliOption( "-Dversion=2" );
         verifier.setLogFileName( "log-cli-specified.txt" );
         verifier.executeGoal( "initialize" );
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
----------------------------------------------------------------------
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 4b4d61a..3105407 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
@@ -117,8 +117,8 @@ public class MavenITmng2387InactiveProxyTest
 
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng2387" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java
----------------------------------------------------------------------
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 262d859..bb9308f 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
@@ -54,8 +54,8 @@ public class MavenITmng2432PluginPrefixOrderTest
         verifier.deleteArtifacts( "org.apache.maven.its.mng2432.pom" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng2432.settings" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "it:touch" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java
----------------------------------------------------------------------
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 dba6941..a737f91 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
@@ -79,8 +79,8 @@ public class MavenITmng2486TimestampedDependencyVersionInterpolationTest
         // enforce remote resolution
         verifier.deleteArtifacts( "org.apache.maven.its.mng2486" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java
index d9ce788..a8bed25 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java
@@ -52,8 +52,8 @@ public class MavenITmng2539PluginDependenciesComeFromPluginReposTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng2539" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java
----------------------------------------------------------------------
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 fe53d7b..48dce1c 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
@@ -59,8 +59,8 @@ public class MavenITmng2576MakeLikeReactorTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         clean( verifier );
-        verifier.getCliOptions().add( "-pl" );
-        verifier.getCliOptions().add( "sub-b" );
+        verifier.addCliOption( "-pl" );
+        verifier.addCliOption( "sub-b" );
         verifier.setLogFileName( "log-only.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -84,9 +84,9 @@ public class MavenITmng2576MakeLikeReactorTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         clean( verifier );
-        verifier.getCliOptions().add( "-pl" );
-        verifier.getCliOptions().add( "sub-b" );
-        verifier.getCliOptions().add( "-am" );
+        verifier.addCliOption( "-pl" );
+        verifier.addCliOption( "sub-b" );
+        verifier.addCliOption( "-am" );
         verifier.setLogFileName( "log-upstream.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -110,9 +110,9 @@ public class MavenITmng2576MakeLikeReactorTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         clean( verifier );
-        verifier.getCliOptions().add( "-pl" );
-        verifier.getCliOptions().add( "sub-b" );
-        verifier.getCliOptions().add( "-amd" );
+        verifier.addCliOption( "-pl" );
+        verifier.addCliOption( "sub-b" );
+        verifier.addCliOption( "-amd" );
         verifier.setLogFileName( "log-downstream.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -136,10 +136,10 @@ public class MavenITmng2576MakeLikeReactorTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         clean( verifier );
-        verifier.getCliOptions().add( "-pl" );
-        verifier.getCliOptions().add( "sub-b" );
-        verifier.getCliOptions().add( "-am" );
-        verifier.getCliOptions().add( "-amd" );
+        verifier.addCliOption( "-pl" );
+        verifier.addCliOption( "sub-b" );
+        verifier.addCliOption( "-am" );
+        verifier.addCliOption( "-amd" );
         verifier.setLogFileName( "log-both.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -164,8 +164,8 @@ public class MavenITmng2576MakeLikeReactorTest
         verifier.setAutoclean( false );
         clean( verifier );
         verifier.assertFileNotPresent( "sub-d/pom.xml" );
-        verifier.getCliOptions().add( "-pl" );
-        verifier.getCliOptions().add( "sub-d" );
+        verifier.addCliOption( "-pl" );
+        verifier.addCliOption( "sub-d" );
         verifier.setLogFileName( "log-basedir.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -189,8 +189,8 @@ public class MavenITmng2576MakeLikeReactorTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         clean( verifier );
-        verifier.getCliOptions().add( "-pl" );
-        verifier.getCliOptions().add( "org.apache.maven.its.mng2576:sub-b" );
+        verifier.addCliOption( "-pl" );
+        verifier.addCliOption( "org.apache.maven.its.mng2576:sub-b" );
         verifier.setLogFileName( "log-id.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -217,8 +217,8 @@ public class MavenITmng2576MakeLikeReactorTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         clean( verifier );
-        verifier.getCliOptions().add( "-pl" );
-        verifier.getCliOptions().add( ":sub-b" );
+        verifier.addCliOption( "-pl" );
+        verifier.addCliOption( ":sub-b" );
         verifier.setLogFileName( "log-artifact-id.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -242,8 +242,8 @@ public class MavenITmng2576MakeLikeReactorTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         clean( verifier );
-        verifier.getCliOptions().add( "-rf" );
-        verifier.getCliOptions().add( "sub-b" );
+        verifier.addCliOption( "-rf" );
+        verifier.addCliOption( "sub-b" );
         verifier.setLogFileName( "log-resume.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java
----------------------------------------------------------------------
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 77bf37a..d7b2e31 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
@@ -50,8 +50,8 @@ public class MavenITmng2577SettingsXmlInterpolationTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings-env.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings-env.xml" );
         verifier.setEnvironmentVariable( "MNGIT", "env-var-test" );
         verifier.setLogFileName( "log-env.txt" );
         verifier.executeGoal( "validate" );
@@ -75,8 +75,8 @@ public class MavenITmng2577SettingsXmlInterpolationTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings-sys.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings-sys.xml" );
         verifier.setSystemProperty( "usr.MNGIT", "usr-prop-test" );
         verifier.setLogFileName( "log-sys.txt" );
         verifier.executeGoal( "validate" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java
----------------------------------------------------------------------
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 6e5f135..a51dbc0 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
@@ -52,8 +52,8 @@ public class MavenITmng2605BogusProfileActivationTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java
----------------------------------------------------------------------
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 e8d00cb..45eb815 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
@@ -57,8 +57,8 @@ public class MavenITmng2695OfflinePluginSnapshotsTest
             verifier.setAutoclean( false );
             verifier.setLogFileName( "log1.txt" );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-            verifier.getCliOptions().add( "--settings" );
-            verifier.getCliOptions().add( "settings.xml" );
+            verifier.addCliOption( "--settings" );
+            verifier.addCliOption( "settings.xml" );
             verifier.executeGoal( "validate" );
             verifier.assertFilePresent( "target/a.txt" );
             verifier.assertFilePresent( "target/b.txt" );
@@ -72,9 +72,9 @@ public class MavenITmng2695OfflinePluginSnapshotsTest
             verifier.deleteDirectory( "target" );
             verifier.setAutoclean( false );
             verifier.setLogFileName( "log2.txt" );
-            verifier.getCliOptions().add( "--settings" );
-            verifier.getCliOptions().add( "settings.xml" );
-            verifier.getCliOptions().add( "--offline" );
+            verifier.addCliOption( "--settings" );
+            verifier.addCliOption( "settings.xml" );
+            verifier.addCliOption( "--offline" );
             verifier.executeGoal( "validate" );
             verifier.assertFilePresent( "target/a.txt" );
             verifier.assertFilePresent( "target/b.txt" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java
----------------------------------------------------------------------
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 8e7949d..bd9e9e2 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
@@ -50,7 +50,7 @@ public class MavenITmng2738ProfileIdCollidesWithCliOptionTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-Pe" );
+        verifier.addCliOption( "-Pe" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java
----------------------------------------------------------------------
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 c244f38..ee96b4c 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
@@ -65,8 +65,8 @@ public class MavenITmng2741PluginMetadataResolutionErrorMessageTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.setLogFileName( "log-" + test + ".txt" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         try
         {
             verifier.executeGoal( goal );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java
----------------------------------------------------------------------
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 fb7b003..948275e 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
@@ -51,8 +51,8 @@ public class MavenITmng2744checksumVerificationTest
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng2744" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java
----------------------------------------------------------------------
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 6c5b019..52a0ec5 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
@@ -52,8 +52,8 @@ public class MavenITmng2749ExtensionAvailableToPluginTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng2749" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java
----------------------------------------------------------------------
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 3d8ec78..78e09b3 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
@@ -49,8 +49,8 @@ public class MavenITmng2861RelocationsAndRangesTest
         verifier.deleteDirectory( "A/target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng2861" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java
----------------------------------------------------------------------
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 4562009..7b6fd26 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
@@ -86,8 +86,8 @@ public class MavenITmng2865MirrorWildcardTest
         verifier.deleteArtifacts( "org.apache.maven.its.mng2865" );
         Properties filterProps = verifier.newDefaultFilterProperties();
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java
index 1820d6d..e24ddcd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java
@@ -60,8 +60,8 @@ public class MavenITmng2883LegacyRepoOfflineTest
                                              verifier.newDefaultFilterProperties() );
 
         // used to inject the remote repository
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( settings.getName() );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( settings.getName() );
 
         // execute once just to make sure this test works at all!
         try
@@ -76,7 +76,7 @@ public class MavenITmng2883LegacyRepoOfflineTest
         }
 
         // the centerpiece of these tests!
-        verifier.getCliOptions().add( "-o" );
+        verifier.addCliOption( "-o" );
 
         // re-run in offline mode, should still succeed by using local repo
         verifier.setLogFileName( "log-parent-b.txt" );
@@ -152,8 +152,8 @@ public class MavenITmng2883LegacyRepoOfflineTest
                                              verifier.newDefaultFilterProperties() );
 
         // used to inject the remote repository
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( settings.getName() );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( settings.getName() );
 
         // execute once just to make sure this test works at all!
         try
@@ -168,7 +168,7 @@ public class MavenITmng2883LegacyRepoOfflineTest
         }
 
         // the centerpiece of these tests!
-        verifier.getCliOptions().add( "-o" );
+        verifier.addCliOption( "-o" );
 
         // re-run in offline mode, should still succeed by using local repo
         verifier.setLogFileName( "log-dep-b.txt" );
@@ -246,14 +246,14 @@ public class MavenITmng2883LegacyRepoOfflineTest
                                              verifier.newDefaultFilterProperties() );
 
         // used to inject the remote repository
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( settings.getName() );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( settings.getName() );
 
         verifier.setLogFileName( "log-plugin-a.txt" );
         verifier.executeGoal( "org.apache.maven.its.mng2883:plugin:1.0-SNAPSHOT:run" );
 
         // the centerpiece of these tests!
-        verifier.getCliOptions().add( "-o" );
+        verifier.addCliOption( "-o" );
 
         // re-run in offline mode, should still succeed by using local repo
         verifier.setLogFileName( "log-plugin-b.txt" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java
----------------------------------------------------------------------
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 249afc4..a9e76b4 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
@@ -54,8 +54,8 @@ public class MavenITmng2892HideCorePlexusUtilsTest
         verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "0.1-mng2892", "jar" );
         verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "0.1-mng2892", "pom" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java
----------------------------------------------------------------------
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 d35559d..eb90864 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
@@ -67,8 +67,8 @@ public class MavenITmng2926PluginPrefixOrderTest
         verifier.setLogFileName( "log-default.txt" );
         verifier.filterFile( "settings-default-template.xml", "settings-default.xml", "UTF-8", 
             verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings-default.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings-default.xml" );
         verifier.executeGoal( "mng-2926:apache" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
@@ -78,8 +78,8 @@ public class MavenITmng2926PluginPrefixOrderTest
         verifier.setLogFileName( "log-custom.txt" );
         verifier.filterFile( "settings-custom-template.xml", "settings-custom.xml", "UTF-8", 
             verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings-custom.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings-custom.xml" );
         verifier.executeGoal( "mng-2926:custom" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java
----------------------------------------------------------------------
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 232e95a..577810e 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
@@ -52,8 +52,8 @@ public class MavenITmng2972OverridePluginDependencyTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifact( "org.apache.maven.its.plugins.class-loader", "dep-b", "0.2-mng-2972", "jar" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
@@ -81,8 +81,8 @@ public class MavenITmng2972OverridePluginDependencyTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifact( "org.apache.maven.its.plugins.class-loader", "dep-b", "9.9-MNG-2972", "jar" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-class-loader:2.1-SNAPSHOT:load" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java
----------------------------------------------------------------------
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 ec3ce6a..2a5713b 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
@@ -49,8 +49,8 @@ public class MavenITmng2994SnapshotRangeRepositoryTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.deleteArtifacts( "org.apache.maven.its.mng2994" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
----------------------------------------------------------------------
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 4c58cc9..1b4c377 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
@@ -53,7 +53,7 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
         verifier.deleteDirectory( "subproject1/target" );
         verifier.deleteDirectory( "subproject2/target" );
         verifier.deleteDirectory( "subproject3/target" );
-        verifier.getCliOptions().add( "--fail-fast" );
+        verifier.addCliOption( "--fail-fast" );
         verifier.setLogFileName( "log-ff-mt1.txt" );
         verifier.setSystemProperty( "maven.threads.experimental", "1" );
 
@@ -89,7 +89,7 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
         verifier.deleteDirectory( "subproject1/target" );
         verifier.deleteDirectory( "subproject2/target" );
         verifier.deleteDirectory( "subproject3/target" );
-        verifier.getCliOptions().add( "--fail-never" );
+        verifier.addCliOption( "--fail-never" );
         verifier.setLogFileName( "log-fn-mt1.txt" );
         verifier.setSystemProperty( "maven.threads.experimental", "1" );
         verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
@@ -117,7 +117,7 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
         verifier.deleteDirectory( "subproject1/target" );
         verifier.deleteDirectory( "subproject2/target" );
         verifier.deleteDirectory( "subproject3/target" );
-        verifier.getCliOptions().add( "--fail-at-end" );
+        verifier.addCliOption( "--fail-at-end" );
         verifier.setLogFileName( "log-fae-mt1.txt" );
         verifier.setSystemProperty( "maven.threads.experimental", "1" );
         try
@@ -152,7 +152,7 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
         verifier.deleteDirectory( "subproject1/target" );
         verifier.deleteDirectory( "subproject2/target" );
         verifier.deleteDirectory( "subproject3/target" );
-        verifier.getCliOptions().add( "--fail-never" );
+        verifier.addCliOption( "--fail-never" );
         verifier.setLogFileName( "log-fn-mt2.txt" );
         verifier.setSystemProperty( "maven.threads.experimental", "2" );
         verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
@@ -180,7 +180,7 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
         verifier.deleteDirectory( "subproject1/target" );
         verifier.deleteDirectory( "subproject2/target" );
         verifier.deleteDirectory( "subproject3/target" );
-        verifier.getCliOptions().add( "--fail-at-end" );
+        verifier.addCliOption( "--fail-at-end" );
         verifier.setLogFileName( "log-fae-mt2.txt" );
         verifier.setSystemProperty( "maven.threads.experimental", "2" );
         try

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java
----------------------------------------------------------------------
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 2c52c5b..bc096ed 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
@@ -53,8 +53,8 @@ public class MavenITmng3012CoreClassImportTest
         verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "0.1-mng3012", "jar" );
         verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "0.1-mng3012", "pom" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
----------------------------------------------------------------------
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 ef62654..b30e195 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
@@ -60,8 +60,8 @@ public class MavenITmng3052DepRepoAggregationTest
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
         verifier.filterFile( "repo-d/org/apache/maven/its/mng3052/direct/0.1-SNAPSHOT/template.pom", 
             "repo-d/org/apache/maven/its/mng3052/direct/0.1-SNAPSHOT/direct-0.1-20090517.133956-1.pom", "UTF-8", filterProps );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java
index adce9f7..7a4f7e3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java
@@ -68,9 +68,9 @@ public class MavenITmng3057VersionExprTransformationsTest
 
         verifier.filterFile( "pom.xml", "pom-filtered.xml", "UTF-8", properties );
 
-        verifier.getCliOptions().add( "-V" );
-        verifier.getCliOptions().add( "-DtestVersion=1" );
-        verifier.getCliOptions().add( "-f pom-filtered.xml" );
+        verifier.addCliOption( "-V" );
+        verifier.addCliOption( "-DtestVersion=1" );
+        verifier.addCliOption( "-f pom-filtered.xml" );
 
         verifier.executeGoal( "generate-sources" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java
----------------------------------------------------------------------
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 aaf571e..a8d55e2 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
@@ -53,8 +53,8 @@ public class MavenITmng3092SnapshotsExcludedFromVersionRangeTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3092" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java
----------------------------------------------------------------------
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 c591c51..ed632b7 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
@@ -53,8 +53,8 @@ public class MavenITmng3099SettingsProfilesWithNoPomTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3099" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "org.apache.maven.its.mng3099:maven-mng3099-plugin:0.1:touch" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java
index 0bda1de..85040c7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java
@@ -54,7 +54,7 @@ public class MavenITmng3106ProfileMultipleActivatorsTest
         verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-Dprofile1.on=true" );
+        verifier.addCliOption( "-Dprofile1.on=true" );
         verifier.executeGoal( "validate" );
 
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java
----------------------------------------------------------------------
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 74d97b3..ed64b25 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
@@ -52,8 +52,8 @@ public class MavenITmng3122ActiveProfilesNoDuplicatesTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java
----------------------------------------------------------------------
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 9413606..01a3a03 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
@@ -56,8 +56,8 @@ public class MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest
 
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.setLogFileName( "log1.txt" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
@@ -70,8 +70,8 @@ public class MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", 
             Collections.singletonMap( "@baseurl@", "http://localhost:63412" ) );
         verifier.setLogFileName( "log2.txt" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java
----------------------------------------------------------------------
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 7860593..6507a81 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
@@ -51,8 +51,8 @@ public class MavenITmng3183LoggingToFileTest
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
-        verifier.getCliOptions().add( "-l" );
-        verifier.getCliOptions().add( "maven.log" );
+        verifier.addCliOption( "-l" );
+        verifier.addCliOption( "maven.log" );
         verifier.setLogFileName( "stdout.txt" );
         new File( testDir, "stdout.txt" ).delete();
         new File( testDir, "maven.log" ).delete();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java
----------------------------------------------------------------------
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 c7cfd8c..45e7135 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
@@ -51,7 +51,7 @@ public class MavenITmng3208ProfileAwareReactorSortingTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-Pmng3208" );
+        verifier.addCliOption( "-Pmng3208" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java
----------------------------------------------------------------------
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 2260fea..b863be1 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
@@ -54,8 +54,8 @@ public class MavenITmng3217InterPluginDependencyTest
         verifier.deleteDirectory( "sub-2/target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3217" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
----------------------------------------------------------------------
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 c611b19..a7abcfd 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
@@ -24,7 +24,6 @@ import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
-import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -52,8 +51,8 @@ public class MavenITmng3220ImportScopeTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3220" );
         verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
@@ -71,8 +70,8 @@ public class MavenITmng3220ImportScopeTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3220" );
         verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
 
         try
         {

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java
index ec3840b..7e69e96 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java
@@ -60,7 +60,7 @@ public class MavenITmng3221InfiniteForkingTest
 
             verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
 
-            verifier.getCliOptions().add( "-Psite" );
+            verifier.addCliOption( "-Psite" );
 
             verifier.setLogFileName( "mng-3221-a-log.txt" );
             verifier.executeGoal( "site" );
@@ -98,7 +98,7 @@ public class MavenITmng3221InfiniteForkingTest
 
             verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
 
-            verifier.getCliOptions().add( "-Pplugin" );
+            verifier.addCliOption( "-Pplugin" );
 
             verifier.setLogFileName( "mng-3221-b-log.txt" );
             verifier.executeGoal( "package" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleDashPCommandLineTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleDashPCommandLineTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleDashPCommandLineTest.java
index f8c603c..ecc9ef6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleDashPCommandLineTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleDashPCommandLineTest.java
@@ -47,9 +47,9 @@ public class MavenITmng3268MultipleDashPCommandLineTest
 
         verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
 
-        verifier.getCliOptions().add( "-Pprofile1,profile2" );
-        verifier.getCliOptions().add( "-Pprofile3" );
-        verifier.getCliOptions().add( "-P profile4" );
+        verifier.addCliOption( "-Pprofile1,profile2" );
+        verifier.addCliOption( "-Pprofile3" );
+        verifier.addCliOption( "-P profile4" );
         verifier.executeGoal( "package" );
 
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java
----------------------------------------------------------------------
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 bab375b..74ca6da 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
@@ -56,8 +56,8 @@ public class MavenITmng3284UsingCachedPluginsTest
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3284" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
@@ -69,8 +69,8 @@ public class MavenITmng3284UsingCachedPluginsTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "mod-a/target" );
         verifier.deleteDirectory( "mod-b/target" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" ); 
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java
----------------------------------------------------------------------
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 8ed3337..73a78f7 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
@@ -55,8 +55,8 @@ public class MavenITmng3314OfflineSnapshotsTest
             verifier.deleteArtifacts( "org.apache.maven.its.mng3314" );
             verifier.setLogFileName( "log1.txt" );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-            verifier.getCliOptions().add( "--settings" );
-            verifier.getCliOptions().add( "settings.xml" );
+            verifier.addCliOption( "--settings" );
+            verifier.addCliOption( "settings.xml" );
             verifier.executeGoal( "validate" );
             verifier.assertFilePresent( "target/compile.txt" );
             verifier.verifyErrorFreeLog();
@@ -67,9 +67,9 @@ public class MavenITmng3314OfflineSnapshotsTest
             // phase 2: run build in offline mode to check it still passes
             Verifier verifier = newVerifier( testDir.getAbsolutePath() );
             verifier.setLogFileName( "log2.txt" );
-            verifier.getCliOptions().add( "-o" );
-            verifier.getCliOptions().add( "--settings" );
-            verifier.getCliOptions().add( "settings.xml" );
+            verifier.addCliOption( "-o" );
+            verifier.addCliOption( "--settings" );
+            verifier.addCliOption( "settings.xml" );
             verifier.executeGoal( "validate" );
             verifier.assertFilePresent( "target/compile.txt" );
             verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java
----------------------------------------------------------------------
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 cb97dbb..d576892 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
@@ -46,7 +46,7 @@ public class MavenITmng3355TranslatedPathInterpolationTest
 
         verifier = newVerifier( testDir.getAbsolutePath() );
 
-        verifier.getCliOptions().add( "-Dversion=foo" );
+        verifier.addCliOption( "-Dversion=foo" );
         verifier.executeGoal( "validate" );
 
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
----------------------------------------------------------------------
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 14e076f..540fd51 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
@@ -59,8 +59,8 @@ public class MavenITmng3372DirectInvocationOfPluginsTest
 
         verifier = newVerifier( project.getAbsolutePath() );
 
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "\"" + settingsFile.getAbsolutePath() + "\"" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "\"" + settingsFile.getAbsolutePath() + "\"" );
 
         verifier.executeGoal( "mng3372:test" );
 
@@ -78,7 +78,7 @@ public class MavenITmng3372DirectInvocationOfPluginsTest
 
         Verifier verifier = newVerifier( testBaseDir.getAbsolutePath(), "remote" );
 
-        verifier.getCliOptions().add( "-U" );
+        verifier.addCliOption( "-U" );
 
         verifier.executeGoal( "dependency:tree" );
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
----------------------------------------------------------------------
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 b1258c3..0809ad7 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
@@ -54,8 +54,8 @@ public class MavenITmng3379ParallelArtifactDownloadsTest
         verifier.deleteArtifacts( "org.apache.maven.its.mng3379.c" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3379.d" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.setSystemProperty( "maven.artifact.threads", "16" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java
----------------------------------------------------------------------
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 85b4c3d..07c61c7 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
@@ -59,8 +59,8 @@ public class MavenITmng3380ManagedRelocatedTransdepsTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3380" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
----------------------------------------------------------------------
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 3164c5f..05276af 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
@@ -96,9 +96,9 @@ public class MavenITmng3415JunkRepositoryMetadataTest
         filterProps.put( "@port@", "0" );
         File settings = verifier.filterFile( "settings-template.xml", "settings-a.xml", "UTF-8", filterProps );
 
-        verifier.getCliOptions().add( "-X" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( settings.getName() );
+        verifier.addCliOption( "-X" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( settings.getName() );
 
         verifier.setLogFileName( "log-" + methodName + "-firstBuild.txt" );
         verifier.executeGoal( "validate" );
@@ -188,9 +188,9 @@ public class MavenITmng3415JunkRepositoryMetadataTest
             filterProps.put( "@port@", Integer.toString( port ) );
             File settings = verifier.filterFile( "settings-template.xml", "settings-b.xml", "UTF-8", filterProps );
 
-            verifier.getCliOptions().add( "-X" );
-            verifier.getCliOptions().add( "-s" );
-            verifier.getCliOptions().add( settings.getName() );
+            verifier.addCliOption( "-X" );
+            verifier.addCliOption( "-s" );
+            verifier.addCliOption( settings.getName() );
 
             setupDummyDependency( verifier, testDir, true );
 


[6/6] git commit: replaced verifier.getCliOptions().add() with verifier.addCliOption()

Posted by hb...@apache.org.
replaced verifier.getCliOptions().add() with
verifier.addCliOption()

Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/c304ba2b
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/c304ba2b
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/c304ba2b

Branch: refs/heads/master
Commit: c304ba2bd4a672ce18cf87db12def0450de62a97
Parents: 82df43e
Author: Hervé Boutemy <hb...@apache.org>
Authored: Mon May 20 16:36:37 2013 +0200
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Mon May 20 16:36:37 2013 +0200

----------------------------------------------------------------------
 .../src/test/java/org/apache/maven/it/ItUtils.java |    3 +-
 ...MavenIT0010DependencyClosureResolutionTest.java |    4 +-
 ...11DefaultVersionByDependencyManagementTest.java |    4 +-
 .../it/MavenIT0018DependencyManagementTest.java    |    4 +-
 .../apache/maven/it/MavenIT0021PomProfileTest.java |    6 +-
 .../maven/it/MavenIT0023SettingsProfileTest.java   |    4 +-
 .../it/MavenIT0037AlternatePomFileSameDirTest.java |    4 +-
 ...avenIT0038AlternatePomFileDifferentDirTest.java |    4 +-
 .../it/MavenIT0039ReleasePomInReactorTest.java     |    2 +-
 ...nIT0041ArtifactTypeFromPluginExtensionTest.java |    4 +-
 .../maven/it/MavenIT0051ReleaseProfileTest.java    |    2 +-
 .../it/MavenIT0085TransitiveSystemScopeTest.java   |    4 +-
 ...nIT0087PluginRealmWithProjectLevelDepsTest.java |    4 +-
 .../it/MavenIT0090EnvVarInterpolationTest.java     |    2 +-
 ...ServerAuthzAvailableToWagonMgrInPluginTest.java |    4 +-
 .../it/MavenIT0142DirectDependencyScopesTest.java  |    4 +-
 .../MavenIT0143TransitiveDependencyScopesTest.java |    4 +-
 ...MavenIT0145ReactorWithIncludesExcludesTest.java |   13 ++---
 .../it/MavenIT0146InstallerSnapshotNaming.java     |   16 +++---
 .../org/apache/maven/it/MavenITBootstrapTest.java  |    4 +-
 .../MavenITmng0095ReactorFailureBehaviorTest.java  |    6 +-
 ...venITmng0294MergeGlobalAndUserSettingsTest.java |    8 ++--
 .../MavenITmng0377PluginLookupFromPrefixTest.java  |    4 +-
 .../MavenITmng0449PluginVersionResolutionTest.java |    8 ++--
 ...nITmng0461TolerateMissingDependencyPomTest.java |    5 +-
 .../it/MavenITmng0479OverrideCentralRepoTest.java  |   20 ++++----
 .../maven/it/MavenITmng0505VersionRangeTest.java   |    4 +-
 .../it/MavenITmng0507ArtifactRelocationTest.java   |    4 +-
 .../MavenITmng0553SettingsAuthzEncryptionTest.java |   16 +++---
 .../MavenITmng0557UserSettingsCliOptionTest.java   |    4 +-
 .../it/MavenITmng0666IgnoreLegacyPomTest.java      |    4 +-
 .../maven/it/MavenITmng0768OfflineModeTest.java    |   16 +++---
 ...mng0773SettingsProfileReactorPollutionTest.java |    4 +-
 ...avenITmng0814ExplicitProfileActivationTest.java |    4 +-
 .../it/MavenITmng0818WarDepsNotTransitiveTest.java |    4 +-
 .../it/MavenITmng0820ConflictResolutionTest.java   |    4 +-
 .../MavenITmng0836PluginParentResolutionTest.java  |    4 +-
 ...enITmng0870ReactorAwarePluginDiscoveryTest.java |    4 +-
 .../it/MavenITmng0947OptionalDependencyTest.java   |    4 +-
 ...onentInjectionViaProjectLevelPluginDepTest.java |    4 +-
 .../MavenITmng1088ReactorPluginResolutionTest.java |    4 +-
 ...MavenITmng1142VersionRangeIntersectionTest.java |    4 +-
 .../MavenITmng1233WarDepWithProvidedScopeTest.java |    4 +-
 .../it/MavenITmng1323AntrunDependenciesTest.java   |    4 +-
 .../it/MavenITmng1349ChecksumFormatsTest.java      |    4 +-
 .../it/MavenITmng1412DependenciesOrderTest.java    |    4 +-
 .../MavenITmng1415QuotedSystemPropertiesTest.java  |    2 +-
 ...MavenITmng1703PluginMgmtDepInheritanceTest.java |    4 +-
 ...51ForcedMetadataUpdateDuringDeploymentTest.java |    4 +-
 .../maven/it/MavenITmng1830ShowVersionTest.java    |    2 +-
 .../MavenITmng1895ScopeConflictResolutionTest.java |    8 ++--
 .../it/MavenITmng1908LegacySnapshotUpdateTest.java |    4 +-
 ...terpolateWithSettingsProfilePropertiesTest.java |    4 +-
 ...2098VersionRangeSatisfiedFromWrongRepoTest.java |    4 +-
 .../MavenITmng2123VersionRangeDependencyTest.java  |    4 +-
 .../MavenITmng2136ActiveByDefaultProfileTest.java  |    4 +-
 ...ng2174PluginDepsManagedByParentProfileTest.java |    4 +-
 .../it/MavenITmng2228ComponentInjectionTest.java   |    4 +-
 ...venITmng2234ActiveProfilesFromSettingsTest.java |    4 +-
 ...276ProfileActivationBySettingsPropertyTest.java |    8 ++--
 .../it/MavenITmng2305MultipleProxiesTest.java      |    5 +-
 .../MavenITmng2309ProfileInjectionOrderTest.java   |    6 +-
 .../MavenITmng2339BadProjectInterpolationTest.java |    4 +-
 .../maven/it/MavenITmng2387InactiveProxyTest.java  |    4 +-
 .../it/MavenITmng2432PluginPrefixOrderTest.java    |    4 +-
 ...estampedDependencyVersionInterpolationTest.java |    4 +-
 ...9PluginDependenciesComeFromPluginReposTest.java |    4 +-
 .../it/MavenITmng2576MakeLikeReactorTest.java      |   40 +++++++-------
 ...MavenITmng2577SettingsXmlInterpolationTest.java |    8 ++--
 .../MavenITmng2605BogusProfileActivationTest.java  |    4 +-
 .../MavenITmng2695OfflinePluginSnapshotsTest.java  |   10 ++--
 ...Tmng2738ProfileIdCollidesWithCliOptionTest.java |    2 +-
 ...41PluginMetadataResolutionErrorMessageTest.java |    4 +-
 .../it/MavenITmng2744checksumVerificationTest.java |    4 +-
 ...venITmng2749ExtensionAvailableToPluginTest.java |    4 +-
 .../it/MavenITmng2861RelocationsAndRangesTest.java |    4 +-
 .../maven/it/MavenITmng2865MirrorWildcardTest.java |    4 +-
 .../it/MavenITmng2883LegacyRepoOfflineTest.java    |   18 +++---
 .../it/MavenITmng2892HideCorePlexusUtilsTest.java  |    4 +-
 .../it/MavenITmng2926PluginPrefixOrderTest.java    |    8 ++--
 ...MavenITmng2972OverridePluginDependencyTest.java |    8 ++--
 .../MavenITmng2994SnapshotRangeRepositoryTest.java |    4 +-
 ...004ReactorFailureBehaviorMultithreadedTest.java |   10 ++--
 .../it/MavenITmng3012CoreClassImportTest.java      |    4 +-
 .../it/MavenITmng3052DepRepoAggregationTest.java   |    4 +-
 ...venITmng3057VersionExprTransformationsTest.java |    6 +-
 ...g3092SnapshotsExcludedFromVersionRangeTest.java |    4 +-
 ...avenITmng3099SettingsProfilesWithNoPomTest.java |    4 +-
 ...avenITmng3106ProfileMultipleActivatorsTest.java |    2 +-
 ...venITmng3122ActiveProfilesNoDuplicatesTest.java |    4 +-
 ...3139UseCachedMetadataOfBlacklistedRepoTest.java |    8 ++--
 .../maven/it/MavenITmng3183LoggingToFileTest.java  |    4 +-
 ...venITmng3208ProfileAwareReactorSortingTest.java |    2 +-
 .../MavenITmng3217InterPluginDependencyTest.java   |    4 +-
 .../maven/it/MavenITmng3220ImportScopeTest.java    |    9 ++--
 .../it/MavenITmng3221InfiniteForkingTest.java      |    4 +-
 ...MavenITmng3268MultipleDashPCommandLineTest.java |    6 +-
 .../it/MavenITmng3284UsingCachedPluginsTest.java   |    8 ++--
 .../it/MavenITmng3314OfflineSnapshotsTest.java     |   10 ++--
 ...enITmng3355TranslatedPathInterpolationTest.java |    2 +-
 ...avenITmng3372DirectInvocationOfPluginsTest.java |    6 +-
 ...avenITmng3379ParallelArtifactDownloadsTest.java |    4 +-
 ...avenITmng3380ManagedRelocatedTransdepsTest.java |    4 +-
 .../MavenITmng3415JunkRepositoryMetadataTest.java  |   12 ++--
 ...etadataUpdatedFromDeploymentRepositoryTest.java |    4 +-
 .../maven/it/MavenITmng3461MirrorMatchingTest.java |   12 ++--
 ...rictCheckumVerificationOfDependencyPomTest.java |    4 +-
 ...ng3477DependencyResolutionErrorMessageTest.java |    4 +-
 ...venITmng3482DependencyPomInterpolationTest.java |    4 +-
 .../maven/it/MavenITmng3529QuotedCliArgTest.java   |    2 +-
 ...avenITmng3535SelfReferentialPropertiesTest.java |    4 +-
 .../it/MavenITmng3545ProfileDeactivationTest.java  |   18 +++---
 ...enITmng3586SystemScopePluginDependencyTest.java |    4 +-
 .../MavenITmng3599useHttpProxyForWebDAVTest.java   |   12 ++--
 .../MavenITmng3600DeploymentModeDefaultsTest.java  |    8 ++--
 ...MavenITmng3641ProfileActivationWarningTest.java |   12 ++--
 .../it/MavenITmng3652UserAgentHeaderTest.java      |   34 ++++++------
 ...nITmng3667ResolveDepsWithBadPomVersionTest.java |    4 +-
 .../it/MavenITmng3680InvalidDependencyPOMTest.java |    4 +-
 .../it/MavenITmng3701ImplicitProfileIdTest.java    |    4 +-
 .../it/MavenITmng3714ToolchainsCliOptionTest.java  |    2 +-
 .../maven/it/MavenITmng3732ActiveProfilesTest.java |    6 +-
 .../it/MavenITmng3746POMPropertyOverrideTest.java  |    6 +-
 .../maven/it/MavenITmng3748BadSettingsXmlTest.java |    4 +-
 .../it/MavenITmng3760BaseUriPropertyTest.java      |    2 +-
 .../MavenITmng3766ToolchainsFromExtensionTest.java |    4 +-
 ...enITmng3769ExclusionRelocatedTransdepsTest.java |    4 +-
 ...Tmng3775ConflictResolutionBacktrackingTest.java |    4 +-
 ...venITmng3805ExtensionClassPathOrderingTest.java |    4 +-
 .../MavenITmng3813PluginClassPathOrderingTest.java |    4 +-
 .../it/MavenITmng3814BogusProjectCycleTest.java    |    4 +-
 .../maven/it/MavenITmng3843PomInheritanceTest.java |    4 +-
 ...MavenITmng3853ProfileInjectedDistReposTest.java |    2 +-
 ...mng3872ProfileActivationInRelocatedPomTest.java |    4 +-
 ...Tmng3885UniqueVersionFromParentProfileTest.java |    8 ++--
 ...mng3890TransitiveDependencyScopeUpdateTest.java |    4 +-
 .../it/MavenITmng3899ExtensionInheritanceTest.java |    4 +-
 ...Tmng3900ProfilePropertiesInterpolationTest.java |    2 +-
 ...ITmng3906MergedPluginClassPathOrderingTest.java |    4 +-
 .../it/MavenITmng3944BasedirInterpolationTest.java |    4 +-
 .../MavenITmng3953AuthenticatedDeploymentTest.java |    6 +-
 .../it/MavenITmng3955EffectiveSettingsTest.java    |    8 ++--
 ...ITmng3970DepResolutionFromProfileReposTest.java |    4 +-
 .../maven/it/MavenITmng3974MirrorOrderingTest.java |    4 +-
 ...ng3983PluginResolutionFromProfileReposTest.java |    4 +-
 .../MavenITmng4009InheritProfileEffectsTest.java   |    2 +-
 ...ITmng4022IdempotentPluginConfigMergingTest.java |    2 +-
 ...ng4036ParentResolutionFromSettingsRepoTest.java |    8 ++--
 .../it/MavenITmng4068AuthenticatedMirrorTest.java  |    4 +-
 .../it/MavenITmng4070WhitespaceTrimmingTest.java   |    4 +-
 .../it/MavenITmng4072InactiveProfileReposTest.java |    4 +-
 ...avenITmng4086ExplicitPluginMetaversionTest.java |    8 ++--
 ...ng4106InterpolationUsesDominantProfileTest.java |    6 +-
 ...InterpolationUsesDominantProfileSourceTest.java |    4 +-
 ...ng4148DepPomInterpWithSettingsProfilesTest.java |    4 +-
 .../maven/it/MavenITmng4150VersionRangeTest.java   |    4 +-
 .../it/MavenITmng4166HideCoreCommonsCliTest.java   |    4 +-
 .../MavenITmng4180PerDependencyExclusionsTest.java |    6 +-
 .../MavenITmng4189UniqueVersionSnapshotTest.java   |    8 ++--
 .../it/MavenITmng4190MirrorRepoMergingTest.java    |    6 +-
 ...MavenITmng4199CompileMeetsRuntimeScopeTest.java |    4 +-
 ...ITmng4203TransitiveDependencyExclusionTest.java |    4 +-
 .../it/MavenITmng4207PluginWithLog4JTest.java      |    4 +-
 ...nterpolationPrefersCliOverProjectPropsTest.java |    2 +-
 ...avenITmng4214MirroredParentSearchReposTest.java |    7 +--
 .../it/MavenITmng4231SnapshotUpdatePolicyTest.java |    8 ++--
 ...enITmng4235HttpAuthDeploymentChecksumsTest.java |    4 +-
 ...MavenITmng4254SelectableWagonProvidersTest.java |   16 +++---
 ...avenITmng4262MakeLikeReactorDottedPathTest.java |    8 ++--
 ...Tmng4269BadReactorResolutionFromOutDirTest.java |    4 +-
 .../it/MavenITmng4274PluginRealmArtifactsTest.java |    4 +-
 .../it/MavenITmng4275RelocationWarningTest.java    |    4 +-
 ...venITmng4276WrongTransitivePlexusUtilsTest.java |    4 +-
 .../MavenITmng4279WagonProviderFailoverTest.java   |    4 +-
 .../it/MavenITmng4281PreferLocalSnapshotTest.java  |    4 +-
 .../MavenITmng4291MojoRequiresOnlineModeTest.java  |    4 +-
 ...mng4293RequiresCompilePlusRuntimeScopeTest.java |    4 +-
 ...309StrictChecksumValidationForMetadataTest.java |    2 +-
 ...7PluginVersionResolutionFromMultiReposTest.java |    4 +-
 ...avenITmng4320AggregatorAndDependenciesTest.java |    4 +-
 ...4326LocalSnapshotSuppressesRemoteCheckTest.java |    6 +-
 ...328PrimitiveMojoParameterConfigurationTest.java |    2 +-
 .../it/MavenITmng4331DependencyCollectionTest.java |    2 +-
 .../it/MavenITmng4335SettingsOfflineModeTest.java  |    4 +-
 ...venITmng4343MissingReleaseUpdatePolicyTest.java |   12 ++--
 ...mng4347ImportScopeWithSettingsProfilesTest.java |    4 +-
 ...ITmng4348NoUnnecessaryRepositoryAccessTest.java |    4 +-
 ...mng4349RelocatedArtifactWithInvalidPomTest.java |    4 +-
 ...3PluginDependencyResolutionFromPomRepoTest.java |    4 +-
 ...355ExtensionAutomaticVersionResolutionTest.java |    4 +-
 ...4357LifecycleMappingDiscoveryInReactorTest.java |    4 +-
 .../maven/it/MavenITmng4360WebDavSupportTest.java  |    4 +-
 ...ITmng4361ForceDependencySnapshotUpdateTest.java |    6 +-
 ...363DynamicAdditionOfDependencyArtifactTest.java |    4 +-
 ...venITmng4367LayoutAwareMirrorSelectionTest.java |   12 ++--
 ...sitiveSystemPathInterpolatedWithEnvVarTest.java |    4 +-
 .../MavenITmng4383ValidDependencyVersionTest.java  |    1 -
 .../maven/it/MavenITmng4386DebugLoggingTest.java   |    3 +-
 .../maven/it/MavenITmng4387QuietLoggingTest.java   |    2 +-
 ...nITmng4393ParseExternalParenPomLenientTest.java |    4 +-
 .../it/MavenITmng4400RepositoryOrderTest.java      |    8 ++--
 ...enITmng4401RepositoryOrderForParentPomTest.java |    4 +-
 .../it/MavenITmng4402DuplicateChildModuleTest.java |    2 +-
 ...enITmng4403LenientDependencyPomParsingTest.java |    6 +-
 .../MavenITmng4408NonExistentSettingsFileTest.java |    8 ++--
 .../it/MavenITmng4412OfflineModeInPluginTest.java  |   16 +++---
 ...avenITmng4413MirroringOfDependencyRepoTest.java |    4 +-
 .../it/MavenITmng4428FollowHttpRedirectTest.java   |    4 +-
 ...avenITmng4433ForceParentSnapshotUpdateTest.java |    6 +-
 ...ng4450StubModelForMissingDependencyPomTest.java |    4 +-
 ...4452ResolutionOfSnapshotWithClassifierTest.java |    4 +-
 ...ITmng4459InMemorySettingsKeptEncryptedTest.java |    4 +-
 ...65PluginPrefixFromLocalCacheOfDownRepoTest.java |    8 ++--
 ...469AuthenticatedDeploymentToCustomRepoTest.java |    4 +-
 ...Tmng4470AuthenticatedDeploymentToProxyTest.java |    4 +-
 ...9ProjectLevelPluginDepUsedForCliConfigTest.java |    4 +-
 ...avenITmng4482ForcePluginSnapshotUpdateTest.java |    8 ++--
 ...mng4488ValidateExternalParenPomLenientTest.java |    4 +-
 ...MavenITmng4489MirroringOfExtensionRepoTest.java |    4 +-
 .../it/MavenITmng4498IgnoreBrokenMetadataTest.java |    6 +-
 ...Tmng4500NoUpdateOfTimestampedSnapshotsTest.java |    8 ++--
 ...4522FailUponMissingDependencyParentPomTest.java |    4 +-
 ...venITmng4526MavenProjectArtifactsScopeTest.java |    6 +-
 ...4553CoreArtifactFilterConsidersGroupIdTest.java |    4 +-
 ...avenITmng4554PluginPrefixMappingUpdateTest.java |   20 ++++----
 ...nITmng4555MetaversionResolutionOfflineTest.java |    8 ++--
 .../MavenITmng4561MirroringOfPluginRepoTest.java   |    4 +-
 ...fixResolutionFromVersionlessPluginMngtTest.java |    4 +-
 ...mng4590ImportedPomUsesSystemPropertiesTest.java |    4 +-
 ...ng4600DependencyOptionalFlagManagementTest.java |    6 +-
 ...enITmng4618AggregatorBuiltAfterModulesTest.java |    2 +-
 ...5SettingsXmlInterpolationWithXmlMarkupTest.java |    4 +-
 ...mng4633DualCompilerExecutionsWeaveModeTest.java |    4 +-
 ...Tmng4654ArtifactHandlerForMainArtifactTest.java |    4 +-
 .../it/MavenITmng4666CoreRealmImportTest.java      |   15 +++---
 ...mng4677DisabledPluginConfigInheritanceTest.java |    2 +-
 .../MavenITmng4679SnapshotUpdateInPluginTest.java  |    6 +-
 ...venITmng4684DistMngtOverridenByProfileTest.java |    2 +-
 ...ng4690InterdependentConflictResolutionTest.java |    6 +-
 ...mng4696MavenProjectDependencyArtifactsTest.java |    6 +-
 ...4720DependencyManagementExclusionMergeTest.java |    6 +-
 ...MavenITmng4721OptionalPluginDependencyTest.java |    4 +-
 ...729MirrorProxyAuthUsedByProjectBuilderTest.java |    6 +--
 .../it/MavenITmng4745PluginVersionUpdateTest.java  |   14 +++---
 ...esolvedMavenProjectDependencyArtifactsTest.java |    4 +-
 ...4755FetchRemoteMetadataForVersionRangeTest.java |    6 +-
 ...enITmng4761PluginLevelDependencyScopesTest.java |    4 +-
 ...Tmng4768NearestMatchConflictResolutionTest.java |    6 +-
 ...refixResolutionDoesntTouchDisabledRepoTest.java |    8 ++--
 ...rsionResolutionDoesntTouchDisabledRepoTest.java |    8 ++--
 ...tipleDepsWithVersionRangeFromLocalRepoTest.java |    2 +-
 ...nITmng4781DeploymentToNexusStagingRepoTest.java |    6 +-
 ...4785TransitiveResolutionInForkedThreadTest.java |    4 +-
 ...ITmng4788InstallationToCustomLocalRepoTest.java |    2 -
 ...ITmng4789ScopeInheritanceMeetsConflictTest.java |   11 ++--
 ...rojectBuilderResolvesRemotePomArtifactTest.java |    4 +-
 ...utionInReactorProjectForkedByLifecycleTest.java |    5 +-
 ...venITmng4800NearestWinsVsScopeWideningTest.java |    8 ++--
 ...eResolutionOfDependenciesDuringReactorTest.java |    8 ++--
 .../MavenITmng4829ChecksumFailureWarningTest.java  |   11 ++---
 ...34ParentProjectResolvedFromRemoteReposTest.java |    4 +-
 .../it/MavenITmng4840MavenPrerequisiteTest.java    |    8 ++--
 ...mng4842ParentResolutionOfDependencyPomTest.java |   10 ++--
 ...eactorResolutionAttachedWithExclusionsTest.java |    2 +-
 .../MavenITmng4877DeployUsingPrivateKeyTest.java   |    4 +-
 ...83FailUponOverconstrainedVersionRangesTest.java |    4 +-
 ...ng4890MakeLikeReactorConsidersVersionsTest.java |   12 ++--
 ...MavenITmng4891RobustSnapshotResolutionTest.java |    2 +-
 ...g4895PluginDepWithNonRelocatedMavenApiTest.java |    4 +-
 ...913UserPropertyVsDependencyPomPropertyTest.java |    6 +-
 ...g4919LifecycleMappingWithSameGoalTwiceTest.java |    2 +-
 ...4925ContainerLookupRealmDuringMojoExecTest.java |    4 +-
 .../maven/it/MavenITmng4936EventSpyTest.java       |    4 +-
 ...mng4955LocalVsRemoteSnapshotResolutionTest.java |    6 +-
 .../MavenITmng4960MakeLikeReactorResumeTest.java   |   20 ++++----
 ...venITmng4963ParentResolutionFromMirrorTest.java |    4 +-
 ...g4973ExtensionVisibleToPluginInReactorTest.java |    4 +-
 ...975ProfileInjectedPluginExecutionOrderTest.java |    6 +-
 ...mng4987TimestampBasedSnapshotSelectionTest.java |    6 +-
 .../maven/it/MavenITmng4991NonProxyHostsTest.java  |    6 +-
 ...VersionRangeDependencyParentResolutionTest.java |    6 +-
 .../it/MavenITmng5009AggregationCycleTest.java     |    1 -
 ...ingBasedCompLookupFromChildPluginRealmTest.java |    4 +-
 .../MavenITmng5064SuppressSnapshotUpdatesTest.java |   10 ++--
 ...usionAtDependencyWithImpliedClassifierTest.java |    6 +-
 ...AggregatorDepResolutionModuleExtensionTest.java |    6 +-
 ...Tmng5137ReactorResolutionInForkedBuildTest.java |    2 +-
 .../maven/it/MavenITmng5175WagonHttpTest.java      |    6 +-
 .../it/MavenITmng5206PlexusLifecycleHonoured.java  |    1 -
 .../it/MavenITmng5208EventSpyParallelTest.java     |    5 +-
 .../maven/it/MavenITmng5214DontMapWsdlToJar.java   |    4 +-
 .../maven/it/MavenITmng5224InjectedSettings.java   |    9 +---
 ...g5280SettingsProfilesRepositoriesOrderTest.java |    8 ++--
 .../it/MavenITmng5338FileOptionToDirectory.java    |    2 +-
 294 files changed, 805 insertions(+), 833 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java b/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java
index 342f8f1..4c58dcd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java
@@ -36,9 +36,10 @@ class ItUtils
         MessageDigest digester = MessageDigest.getInstance( algo );
 
         FileInputStream is = new FileInputStream( file );
+        DigestInputStream dis;
         try
         {
-            DigestInputStream dis = new DigestInputStream( is, digester );
+            dis = new DigestInputStream( is, digester );
 
             for ( byte[] buffer = new byte[1024 * 4]; dis.read( buffer ) >= 0; )
             {

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java
----------------------------------------------------------------------
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 98a7cfc..edb4d55 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
@@ -48,8 +48,8 @@ public class MavenIT0010DependencyClosureResolutionTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.it0010" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java
----------------------------------------------------------------------
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 5a93e9c..1f0e3f8 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
@@ -45,8 +45,8 @@ public class MavenIT0011DefaultVersionByDependencyManagementTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.it0011" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java
----------------------------------------------------------------------
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 f3b3e06..1a00e74 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
@@ -45,8 +45,8 @@ public class MavenIT0018DependencyManagementTest
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.it0018" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
         verifier.assertArtifactPresent( "org.apache.maven.its.it0018", "managed-dep", "1.0.3", "jar" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java
----------------------------------------------------------------------
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 d9398bb..bfb0746 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
@@ -46,9 +46,9 @@ public class MavenIT0021PomProfileTest
         verifier.deleteArtifacts( "org.apache.maven.its.it0021" );
         verifier.getSystemProperties().setProperty( "includeProfile", "true" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
-        verifier.getCliOptions().add( "-Pprofile-2" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
+        verifier.addCliOption( "-Pprofile-2" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java
----------------------------------------------------------------------
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 7bf225a..8a8bff7 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
@@ -44,8 +44,8 @@ public class MavenIT0023SettingsProfileTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java
----------------------------------------------------------------------
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 d1a599f..fd03010 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
@@ -49,8 +49,8 @@ public class MavenIT0037AlternatePomFileSameDirTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-f" );
-        verifier.getCliOptions().add( "pom2.xml" );
+        verifier.addCliOption( "-f" );
+        verifier.addCliOption( "pom2.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java
----------------------------------------------------------------------
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 bce3a88..ce739cf 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
@@ -49,8 +49,8 @@ public class MavenIT0038AlternatePomFileDifferentDirTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "project/target" );
-        verifier.getCliOptions().add( "-f" );
-        verifier.getCliOptions().add( "project/pom2.xml" );
+        verifier.addCliOption( "-f" );
+        verifier.addCliOption( "project/pom2.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java
index c3136b4..5fcb111 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java
@@ -52,7 +52,7 @@ public class MavenIT0039ReleasePomInReactorTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "project/target" );
         verifier.deleteDirectory( "project2/target" );
-        verifier.getCliOptions().add( "-r" );
+        verifier.addCliOption( "-r" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
----------------------------------------------------------------------
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 1ac8e55..23a7ca2 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
@@ -49,8 +49,8 @@ public class MavenIT0041ArtifactTypeFromPluginExtensionTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven", "maven-core-it-support", "1.2" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java
----------------------------------------------------------------------
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 c4d50ea..feb260e 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
@@ -44,7 +44,7 @@ public class MavenIT0051ReleaseProfileTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-DperformRelease=true" );
+        verifier.addCliOption( "-DperformRelease=true" );
         verifier.executeGoal( "package" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java
----------------------------------------------------------------------
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 5d92526..af05157 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
@@ -50,8 +50,8 @@ public class MavenIT0085TransitiveSystemScopeTest
         verifier.deleteArtifacts( "org.apache.maven.its.it0085" );
         verifier.getSystemProperties().setProperty( "test.home", testDir.getAbsolutePath() );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java
----------------------------------------------------------------------
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 2f22369..bf97d0a 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
@@ -53,8 +53,8 @@ public class MavenIT0087PluginRealmWithProjectLevelDepsTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.it0087" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java
----------------------------------------------------------------------
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 9624ef6..99d5c3a 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
@@ -45,7 +45,7 @@ public class MavenIT0090EnvVarInterpolationTest
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0090" );
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        Map envVars = new HashMap();
+        Map<String, String> envVars = new HashMap<String, String>();
         envVars.put( "MAVEN_TEST_ENVAR", "MAVEN_TEST_ENVAR_VALUE" );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java
----------------------------------------------------------------------
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 d3768e7..a0d21bf 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
@@ -45,8 +45,8 @@ public class MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java
----------------------------------------------------------------------
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 6da0960..157ea9e 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
@@ -59,8 +59,8 @@ public class MavenIT0142DirectDependencyScopesTest
         Properties filterProps = verifier.newDefaultFilterProperties();
         verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", filterProps );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java
----------------------------------------------------------------------
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 69c5ac5..2f8d753 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
@@ -240,8 +240,8 @@ public class MavenIT0143TransitiveDependencyScopesTest
         filterProps.setProperty( "@scope@", scope );
         verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", filterProps );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.setLogFileName( "log-" + scope + ".txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java
index 83db2a9..43e0094 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java
@@ -23,9 +23,6 @@ import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 
 /**
  * 
@@ -54,7 +51,7 @@ public class MavenIT0145ReactorWithIncludesExcludesTest
         verifier.deleteDirectory( "target" );
         verifier.deleteDirectory( "mod-a/target" );
         verifier.deleteDirectory( "mod-b/target" );
-        verifier.getCliOptions().add( "-r" );
+        verifier.addCliOption( "-r" );
         verifier.setLogFileName( "log-defaults.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -78,8 +75,8 @@ public class MavenIT0145ReactorWithIncludesExcludesTest
         verifier.deleteDirectory( "target" );
         verifier.deleteDirectory( "mod-a/target" );
         verifier.deleteDirectory( "mod-b/target" );
-        verifier.getCliOptions().add( "-r" );
-        verifier.getCliOptions().add( "-Dmaven.reactor.includes=mod-a/pom.xml" );
+        verifier.addCliOption( "-r" );
+        verifier.addCliOption( "-Dmaven.reactor.includes=mod-a/pom.xml" );
         verifier.setLogFileName( "log-includes.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -103,8 +100,8 @@ public class MavenIT0145ReactorWithIncludesExcludesTest
         verifier.deleteDirectory( "target" );
         verifier.deleteDirectory( "mod-a/target" );
         verifier.deleteDirectory( "mod-b/target" );
-        verifier.getCliOptions().add( "-r" );
-        verifier.getCliOptions().add( "-Dmaven.reactor.excludes=mod-a/pom.xml" );
+        verifier.addCliOption( "-r" );
+        verifier.addCliOption( "-Dmaven.reactor.excludes=mod-a/pom.xml" );
         verifier.setLogFileName( "log-excludes.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
----------------------------------------------------------------------
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 f0f0433..d25e641 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
@@ -95,12 +95,12 @@ public class MavenIT0146InstallerSnapshotNaming
 
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", properties );
 
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
 
         verifier.deleteArtifacts( "org.apache.maven.its.it0146" );
 
-        verifier.getCliOptions().add( "-X" );
+        verifier.addCliOption( "-X" );
 
         verifier.deleteDirectory( "target" );
 
@@ -119,8 +119,8 @@ public class MavenIT0146InstallerSnapshotNaming
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.deleteArtifacts( "org.apache.maven.its.it0146" );
-        verifier.getCliOptions().add( "-f" );
-        verifier.getCliOptions().add( "project/pom.xml" );
+        verifier.addCliOption( "-f" );
+        verifier.addCliOption( "project/pom.xml" );
         verifier.deleteDirectory( "project/target" );
         verifier.setLogFileName( "log2.txt" );
 
@@ -136,12 +136,12 @@ public class MavenIT0146InstallerSnapshotNaming
 
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", properties );
 
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.setLogFileName( "log3.txt" );
 
 
-        verifier.getCliOptions().add( "-X" );
+        verifier.addCliOption( "-X" );
 
         verifier.deleteDirectory( "target" );
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java
----------------------------------------------------------------------
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 4d1afb6..849b5ee 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
@@ -47,8 +47,8 @@ public class MavenITBootstrapTest
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
         verifier.setAutoclean( false );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "test-compile" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
----------------------------------------------------------------------
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 920831e..495e24c 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
@@ -53,7 +53,7 @@ public class MavenITmng0095ReactorFailureBehaviorTest
         verifier.deleteDirectory( "subproject1/target" );
         verifier.deleteDirectory( "subproject2/target" );
         verifier.deleteDirectory( "subproject3/target" );
-        verifier.getCliOptions().add( "--fail-fast" );
+        verifier.addCliOption( "--fail-fast" );
         verifier.setLogFileName( "log-ff.txt" );
         try
         {
@@ -87,7 +87,7 @@ public class MavenITmng0095ReactorFailureBehaviorTest
         verifier.deleteDirectory( "subproject1/target" );
         verifier.deleteDirectory( "subproject2/target" );
         verifier.deleteDirectory( "subproject3/target" );
-        verifier.getCliOptions().add( "--fail-never" );
+        verifier.addCliOption( "--fail-never" );
         verifier.setLogFileName( "log-fn.txt" );
         verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
         verifier.resetStreams();
@@ -114,7 +114,7 @@ public class MavenITmng0095ReactorFailureBehaviorTest
         verifier.deleteDirectory( "subproject1/target" );
         verifier.deleteDirectory( "subproject2/target" );
         verifier.deleteDirectory( "subproject3/target" );
-        verifier.getCliOptions().add( "--fail-at-end" );
+        verifier.addCliOption( "--fail-at-end" );
         verifier.setLogFileName( "log-fae.txt" );
         try
         {

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
----------------------------------------------------------------------
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 518348a..628afd5 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
@@ -50,13 +50,13 @@ public class MavenITmng0294MergeGlobalAndUserSettingsTest
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "user-settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "user-settings.xml" );
         if ( matchesVersionRange( "[2.1.0-M2,)" ) )
         {
             // dedicated CLI option only available since MNG-3914
-            verifier.getCliOptions().add( "--global-settings" );
-            verifier.getCliOptions().add( "global-settings.xml" );
+            verifier.addCliOption( "--global-settings" );
+            verifier.addCliOption( "global-settings.xml" );
         }
         else
         {

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
----------------------------------------------------------------------
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 d1623b5..a1b082b 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
@@ -52,8 +52,8 @@ public class MavenITmng0377PluginLookupFromPrefixTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng0377" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.setSystemProperty( "touch.outputFile", "target/file.txt" );
         verifier.executeGoal( "itprefix:touch" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
----------------------------------------------------------------------
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 249c2cc..f5fa11c 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
@@ -60,8 +60,8 @@ public class MavenITmng0449PluginVersionResolutionTest
         {
             // when we run Maven embedded, the plugin class realm locks the artifacts so we can't delete them
         }
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -102,8 +102,8 @@ public class MavenITmng0449PluginVersionResolutionTest
         {
             // when we run Maven embedded, the plugin class realm locks the artifacts so we can't delete them
         }
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        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.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java
----------------------------------------------------------------------
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 a598417..74447c3 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
@@ -24,7 +24,6 @@ import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
 import java.util.List;
-import java.util.Properties;
 
 /**
  * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-461">MNG-461</a>.
@@ -53,8 +52,8 @@ public class MavenITmng0461TolerateMissingDependencyPomTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng0461" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
----------------------------------------------------------------------
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 a6b003e..3f24afd 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
@@ -64,8 +64,8 @@ public class MavenITmng0479OverrideCentralRepoTest
         verifier.deleteDirectory( "target" );
 
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
@@ -126,8 +126,8 @@ public class MavenITmng0479OverrideCentralRepoTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng0479" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
@@ -144,8 +144,8 @@ public class MavenITmng0479OverrideCentralRepoTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         try
         {
             verifier.executeGoal( "validate" );
@@ -164,8 +164,8 @@ public class MavenITmng0479OverrideCentralRepoTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         try
         {
             verifier.executeGoal( "org.apache.maven.its.mng0479:maven-mng0479-plugin:0.1-SNAPSHOT:touch" );
@@ -185,8 +185,8 @@ public class MavenITmng0479OverrideCentralRepoTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         try
         {
             verifier.executeGoal( "org.apache.maven.its.mng0479:maven-mng0479-plugin:0.1-SNAPSHOT:touch" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
----------------------------------------------------------------------
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 366bfc9..d50633f 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
@@ -56,8 +56,8 @@ public class MavenITmng0505VersionRangeTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng0505" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
----------------------------------------------------------------------
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 45d6ee2..e568584 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
@@ -52,8 +52,8 @@ public class MavenITmng0507ArtifactRelocationTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven", "maven-core-it-support", "1.1" );
         verifier.deleteArtifacts( "org.apache.maven", "maven-core-it-support-old-location", "1.1" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
----------------------------------------------------------------------
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 ab01e9c..aafe247 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
@@ -124,8 +124,8 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
         verifier.assertArtifactNotPresent( "org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
         setUserHome( verifier, new File( testDir, "userhome" ) );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
@@ -159,8 +159,8 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
 
         verifier.getSystemProperties().setProperty( "settings.security", 
             new File( testDir, "settings~security.xml" ).getAbsolutePath() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         // NOTE: The selection of the Turkish language for the JVM locale is essential part of the test
         verifier.executeGoal( "validate", Collections.singletonMap( "MAVEN_OPTS", "-Duser.language=tr" ) );
         verifier.verifyErrorFreeLog();
@@ -182,8 +182,8 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         setUserHome( verifier, new File( testDir, "userhome" ) );
-        verifier.getCliOptions().add( "--encrypt-master-password" );
-        verifier.getCliOptions().add( "test" );
+        verifier.addCliOption( "--encrypt-master-password" );
+        verifier.addCliOption( "test" );
         verifier.setLogFileName( "log-emp.txt" );
         verifier.executeGoal( "-e" );
         verifier.verifyErrorFreeLog();
@@ -195,8 +195,8 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
         verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         setUserHome( verifier, new File( testDir, "userhome" ) );
-        verifier.getCliOptions().add( "--encrypt-password" );
-        verifier.getCliOptions().add( "testpass" );
+        verifier.addCliOption( "--encrypt-password" );
+        verifier.addCliOption( "testpass" );
         verifier.setLogFileName( "log-ep.txt" );
         verifier.executeGoal( "-e" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java
----------------------------------------------------------------------
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 10828a6..68586bc 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
@@ -49,8 +49,8 @@ public class MavenITmng0557UserSettingsCliOptionTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java
----------------------------------------------------------------------
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 1fbaf30..8bc889d 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
@@ -53,8 +53,8 @@ public class MavenITmng0666IgnoreLegacyPomTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.it0059" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         // don't verify error free log
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
----------------------------------------------------------------------
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 9d8b4cd..a5a5546 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
@@ -116,8 +116,8 @@ public class MavenITmng0768OfflineModeTest
                 Properties props = new Properties();
                 props.put( "@port@", Integer.toString( port ) );
                 verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", props );
-                verifier.getCliOptions().add( "--settings" );
-                verifier.getCliOptions().add( "settings.xml" );
+                verifier.addCliOption( "--settings" );
+                verifier.addCliOption( "settings.xml" );
                 verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
                 verifier.assertFilePresent( "target/compile.txt" );
                 verifier.verifyErrorFreeLog();
@@ -131,9 +131,9 @@ public class MavenITmng0768OfflineModeTest
                 Verifier verifier = newVerifier( testDir.getAbsolutePath() );
                 verifier.setAutoclean( false );
                 verifier.deleteDirectory( "target" );
-                verifier.getCliOptions().add( "-o" );
-                verifier.getCliOptions().add( "--settings" );
-                verifier.getCliOptions().add( "settings.xml" );
+                verifier.addCliOption( "-o" );
+                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.assertFilePresent( "target/compile.txt" );
@@ -150,9 +150,9 @@ public class MavenITmng0768OfflineModeTest
                 verifier.setAutoclean( false );
                 verifier.deleteDirectory( "target" );
                 verifier.deleteArtifacts( "org.apache.maven.its.mng0768" );
-                verifier.getCliOptions().add( "-o" );
-                verifier.getCliOptions().add( "--settings" );
-                verifier.getCliOptions().add( "settings.xml" );
+                verifier.addCliOption( "-o" );
+                verifier.addCliOption( "--settings" );
+                verifier.addCliOption( "settings.xml" );
                 verifier.setLogFileName( "log3.txt" );
                 try
                 {

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java
----------------------------------------------------------------------
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 b4561e5..ca3c18c 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
@@ -48,8 +48,8 @@ public class MavenITmng0773SettingsProfileReactorPollutionTest
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java
----------------------------------------------------------------------
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 d461777..40a97a1 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
@@ -50,8 +50,8 @@ public class MavenITmng0814ExplicitProfileActivationTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-P" );
-        verifier.getCliOptions().add( "test-profile" );
+        verifier.addCliOption( "-P" );
+        verifier.addCliOption( "test-profile" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java
----------------------------------------------------------------------
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 42e724a..c54c22b 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
@@ -53,8 +53,8 @@ public class MavenITmng0818WarDepsNotTransitiveTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.it0080" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java
----------------------------------------------------------------------
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 40d0a2c..8587e75 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
@@ -52,8 +52,8 @@ public class MavenITmng0820ConflictResolutionTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng0820" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java
----------------------------------------------------------------------
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 ab36dc9..b9dff9b 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
@@ -54,8 +54,8 @@ public class MavenITmng0836PluginParentResolutionTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng836" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         // 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)" ) )
         {

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java
----------------------------------------------------------------------
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 71e2649..d8d70f8 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
@@ -53,8 +53,8 @@ public class MavenITmng0870ReactorAwarePluginDiscoveryTest
         verifier.deleteDirectory( "project/target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng0870" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "initialize" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java
----------------------------------------------------------------------
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 7605b0a..e72bc48 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
@@ -53,8 +53,8 @@ public class MavenITmng0947OptionalDependencyTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng0947" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java
----------------------------------------------------------------------
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 ed629a3..44e57f6 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
@@ -51,8 +51,8 @@ public class MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng0956" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java
----------------------------------------------------------------------
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 ad0de1e..08a47af 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
@@ -54,8 +54,8 @@ public class MavenITmng1088ReactorPluginResolutionTest
         verifier.deleteDirectory( "client/target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng1088" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        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.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java
----------------------------------------------------------------------
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 a4ccf32..472469f 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
@@ -68,8 +68,8 @@ public class MavenITmng1142VersionRangeIntersectionTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng1142" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java
----------------------------------------------------------------------
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 f60a98c..174616e 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
@@ -52,8 +52,8 @@ public class MavenITmng1233WarDepWithProvidedScopeTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.it0083" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java
----------------------------------------------------------------------
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 18aabd9..237c231 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
@@ -57,8 +57,8 @@ public class MavenITmng1323AntrunDependenciesTest
         verifier.deleteDirectory( "c/target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng1323" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" ); 
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java
----------------------------------------------------------------------
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 3f30d26..10b749b 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
@@ -51,8 +51,8 @@ public class MavenITmng1349ChecksumFormatsTest
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng1349" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java
----------------------------------------------------------------------
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 f6b909a..9deecdd 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
@@ -51,8 +51,8 @@ public class MavenITmng1412DependenciesOrderTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng1412" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java
----------------------------------------------------------------------
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 dcee690..988a457 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
@@ -49,7 +49,7 @@ public class MavenITmng1415QuotedSystemPropertiesTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-Dtest.property=\"Test Property\"" );
+        verifier.addCliOption( "-Dtest.property=\"Test Property\"" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();


[4/6] replaced verifier.getCliOptions().add() with verifier.addCliOption()

Posted by hb...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java
----------------------------------------------------------------------
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 0766810..e489f07 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
@@ -56,8 +56,8 @@ public class MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest
 
         verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
 
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "deploy" );
 
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
----------------------------------------------------------------------
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 2d657d1..b9388ad 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
@@ -64,8 +64,8 @@ public class MavenITmng3461MirrorMatchingTest
         verifier.deleteArtifacts( "org.apache.maven.its.mng3461" );
         Properties filterProps = verifier.newDefaultFilterProperties();
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
@@ -128,8 +128,8 @@ public class MavenITmng3461MirrorMatchingTest
             Properties filterProps = verifier.newDefaultFilterProperties();
             filterProps.setProperty( "@test.port@", Integer.toString( port ) );
             verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-            verifier.getCliOptions().add( "--settings" );
-            verifier.getCliOptions().add( "settings.xml" );
+            verifier.addCliOption( "--settings" );
+            verifier.addCliOption( "settings.xml" );
             verifier.executeGoal( "validate" );
             verifier.verifyErrorFreeLog();
             verifier.resetStreams();
@@ -158,8 +158,8 @@ public class MavenITmng3461MirrorMatchingTest
         verifier.deleteArtifacts( "org.apache.maven.its.mng3461" );
         Properties filterProps = verifier.newDefaultFilterProperties();
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictCheckumVerificationOfDependencyPomTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictCheckumVerificationOfDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictCheckumVerificationOfDependencyPomTest.java
index cb62336..f21f8aa 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictCheckumVerificationOfDependencyPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictCheckumVerificationOfDependencyPomTest.java
@@ -51,8 +51,8 @@ public class MavenITmng3470StrictCheckumVerificationOfDependencyPomTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3470" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         try
         {
             try

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java
----------------------------------------------------------------------
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 976d83d..95d33d2 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
@@ -50,8 +50,8 @@ public class MavenITmng3477DependencyResolutionErrorMessageTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3477" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         try
         {
             verifier.executeGoal( "validate" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java
----------------------------------------------------------------------
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 55d6abc..11336b2 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
@@ -50,8 +50,8 @@ public class MavenITmng3482DependencyPomInterpolationTest
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3482" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java
----------------------------------------------------------------------
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 db945e1..149e76e 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
@@ -51,7 +51,7 @@ public class MavenITmng3529QuotedCliArgTest
         verifier.setForkJvm( true ); // NOTE: We want to go through the launcher script
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-Dtest.a=\"  \"" );
+        verifier.addCliOption( "-Dtest.a=\"  \"" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java
----------------------------------------------------------------------
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 86d1f04..54af31e 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
@@ -46,7 +46,7 @@ public class MavenITmng3535SelfReferentialPropertiesTest
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
 
-        verifier.getCliOptions().add( "-X" );
+        verifier.addCliOption( "-X" );
 
         verifier.setAutoclean( false );
         verifier.executeGoal( "verify" );
@@ -63,7 +63,7 @@ public class MavenITmng3535SelfReferentialPropertiesTest
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
 
-        verifier.getCliOptions().add( "-X" );
+        verifier.addCliOption( "-X" );
 
         verifier.setAutoclean( false );
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java
----------------------------------------------------------------------
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 65c7f7f..be773d7 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
@@ -79,8 +79,8 @@ public class MavenITmng3545ProfileDeactivationTest
         verifier.setLogFileName( "log2.txt" );
 
         // Deactivate active by default profiles
-        verifier.getCliOptions().add( "-P-profile1" );
-        verifier.getCliOptions().add( "-P -profile2" );
+        verifier.addCliOption( "-P-profile1" );
+        verifier.addCliOption( "-P -profile2" );
 
         verifier.executeGoal( "validate" );
 
@@ -101,8 +101,8 @@ public class MavenITmng3545ProfileDeactivationTest
         verifier.setLogFileName( "log3.txt" );
 
         // Deactivate active by default profiles
-        verifier.getCliOptions().add( "-P!profile1" );
-        verifier.getCliOptions().add( "-P !profile2" );
+        verifier.addCliOption( "-P!profile1" );
+        verifier.addCliOption( "-P !profile2" );
 
         verifier.executeGoal( "validate" );
 
@@ -128,8 +128,8 @@ public class MavenITmng3545ProfileDeactivationTest
         verifier.setLogFileName( "log4.txt" );
 
         // Activate with a prop, then deactivate
-        verifier.getCliOptions().add( "-Dprofile3-active-by-property=true" );
-        verifier.getCliOptions().add( "-P-profile3" );
+        verifier.addCliOption( "-Dprofile3-active-by-property=true" );
+        verifier.addCliOption( "-P-profile3" );
 
         verifier.executeGoal( "validate" );
 
@@ -158,8 +158,8 @@ public class MavenITmng3545ProfileDeactivationTest
         verifier.setLogFileName( "log5.txt" );
 
         // Activate then deactivate
-        verifier.getCliOptions().add( "-Pprofile4" );
-        verifier.getCliOptions().add( "-P-profile4" );
+        verifier.addCliOption( "-Pprofile4" );
+        verifier.addCliOption( "-P-profile4" );
 
         verifier.executeGoal( "validate" );
 
@@ -188,7 +188,7 @@ public class MavenITmng3545ProfileDeactivationTest
         verifier.setLogFileName( "log6.txt" );
 
         // Activate
-        verifier.getCliOptions().add( "-Pprofile4" );
+        verifier.addCliOption( "-Pprofile4" );
 
         verifier.executeGoal( "validate" );
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java
----------------------------------------------------------------------
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 218851a..a100da1 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
@@ -55,8 +55,8 @@ public class MavenITmng3586SystemScopePluginDependencyTest
         verifier.deleteArtifacts( "org.apache.maven.its.mng3586" );
         verifier.getSystemProperties().setProperty( "test.home", testDir.getAbsolutePath() );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
index f2ee6eb..b9cb20b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
@@ -154,9 +154,9 @@ public class MavenITmng3599useHttpProxyForWebDAVTest
         
         verifier = newVerifier( testDir.getAbsolutePath() );
 
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
-        verifier.getCliOptions().add( "-X" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
+        verifier.addCliOption( "-X" );
 
         verifier.deleteArtifacts( "org.apache.maven.its.mng3599" );
 
@@ -198,9 +198,9 @@ public class MavenITmng3599useHttpProxyForWebDAVTest
 
         verifier = newVerifier( testDir.getAbsolutePath() );
 
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
-        verifier.getCliOptions().add( "-X" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
+        verifier.addCliOption( "-X" );
 
         verifier.deleteArtifacts( "org.apache.maven.its.mng3599" );
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
----------------------------------------------------------------------
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 93bde3b..67da40a 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
@@ -66,8 +66,8 @@ public class MavenITmng3600DeploymentModeDefaultsTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
 
         new File( testDir, "wagon.properties" ).delete();
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings-server-defaults.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings-server-defaults.xml" );
         verifier.setLogFileName( "log-server-defaults.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -87,8 +87,8 @@ public class MavenITmng3600DeploymentModeDefaultsTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
 
         new File( testDir, "wagon.properties" ).delete();
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings-modes-set.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings-modes-set.xml" );
         verifier.setLogFileName( "log-modes-set.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java
----------------------------------------------------------------------
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 e760203..6e9cdce 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
@@ -51,7 +51,7 @@ public class MavenITmng3641ProfileActivationWarningTest
         verifier.deleteArtifact( "org.apache.maven.its.mng3641", "parent", "1.0", "pom" );
 
         // (1) make sure the profile is found. Must not contain a warning.
-        verifier.getCliOptions().add( "-P mng-3641-it-provided-profile" );
+        verifier.addCliOption( "-P mng-3641-it-provided-profile" );
         verifier.setLogFileName( "log-1.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -62,7 +62,7 @@ public class MavenITmng3641ProfileActivationWarningTest
 
         // (2) make sure the profile was not found and a warning was printed.
         verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.getCliOptions().add( "-P mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p" );
+        verifier.addCliOption( "-P mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p" );
         verifier.setLogFileName( "log-2.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -74,7 +74,7 @@ public class MavenITmng3641ProfileActivationWarningTest
         // (3) make sure the first profile is found while the other is not and a warning was printed
         // accordingly.
         verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.getCliOptions().add( "-P mng-3641-it-provided-profile,mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p" );
+        verifier.addCliOption( "-P mng-3641-it-provided-profile,mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p" );
         verifier.setLogFileName( "log-3.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -86,7 +86,7 @@ public class MavenITmng3641ProfileActivationWarningTest
 
         // (4) make sure the warning is only printed when the profile is missing in all projects
         verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.getCliOptions().add( "-P mng-3641-it-provided-profile-child" );
+        verifier.addCliOption( "-P mng-3641-it-provided-profile-child" );
         verifier.setLogFileName( "log-4.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -97,7 +97,7 @@ public class MavenITmng3641ProfileActivationWarningTest
 
         // (5) make sure the profile is found in subproject. Must not contain a warning.
         verifier = newVerifier( new File( testDir, "child1" ).getAbsolutePath() );
-        verifier.getCliOptions().add( "-P mng-3641-it-provided-profile-child" );
+        verifier.addCliOption( "-P mng-3641-it-provided-profile-child" );
         verifier.setLogFileName( "log-5.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -108,7 +108,7 @@ public class MavenITmng3641ProfileActivationWarningTest
 
         // (6) make sure the profile is found from parent in subproject. Must not contain a warning.
         verifier = newVerifier( new File( testDir, "child1" ).getAbsolutePath() );
-        verifier.getCliOptions().add( "-P mng-3641-it-provided-profile" );
+        verifier.addCliOption( "-P mng-3641-it-provided-profile" );
         verifier.setLogFileName( "log-6.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
----------------------------------------------------------------------
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 e2cba5a..7138843 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
@@ -116,8 +116,8 @@ public class MavenITmng3652UserAgentHeaderTest
 
         verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
 
-        verifier.getCliOptions().add( "-DtestPort=" + port );
-        verifier.getCliOptions().add( "-X" );
+        verifier.addCliOption( "-DtestPort=" + port );
+        verifier.addCliOption( "-X" );
 
         verifier.setLogFileName( "log-unConfiguredHttp.txt" );
         verifier.executeGoal( "validate" );
@@ -167,9 +167,9 @@ public class MavenITmng3652UserAgentHeaderTest
         verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
 
         // test webdav
-        verifier.getCliOptions().add( "-DtestPort=" + port );
-        verifier.getCliOptions().add( "-DtestProtocol=dav:http" );
-        verifier.getCliOptions().add( "-X" );
+        verifier.addCliOption( "-DtestPort=" + port );
+        verifier.addCliOption( "-DtestProtocol=dav:http" );
+        verifier.addCliOption( "-X" );
 
         verifier.setLogFileName( "log-unConfiguredDAV.txt" );
         verifier.executeGoal( "validate" );
@@ -220,10 +220,10 @@ public class MavenITmng3652UserAgentHeaderTest
 
         // test settings with no config
 
-        verifier.getCliOptions().add( "-DtestPort=" + port );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings-no-config.xml" );
-        verifier.getCliOptions().add( "-X" );
+        verifier.addCliOption( "-DtestPort=" + port );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings-no-config.xml" );
+        verifier.addCliOption( "-X" );
 
         verifier.setLogFileName( "log-configWithoutUserAgent.txt" );
         verifier.executeGoal( "validate" );
@@ -278,10 +278,10 @@ public class MavenITmng3652UserAgentHeaderTest
 
         // test settings with config
 
-        verifier.getCliOptions().add( "-DtestPort=" + port );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
-        verifier.getCliOptions().add( "-X" );
+        verifier.addCliOption( "-DtestPort=" + port );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
+        verifier.addCliOption( "-X" );
 
         verifier.setLogFileName( "log-configWithUserAgent.txt" );
         verifier.executeGoal( "validate" );
@@ -314,10 +314,10 @@ public class MavenITmng3652UserAgentHeaderTest
 
         // test settings with config
 
-        verifier.getCliOptions().add( "-DtestPort=" + port );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
-        verifier.getCliOptions().add( "-X" );
+        verifier.addCliOption( "-DtestPort=" + port );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
+        verifier.addCliOption( "-X" );
 
         verifier.setLogFileName( "log-configWithUserAgent.txt" );
         verifier.executeGoal( "validate" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java
----------------------------------------------------------------------
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 ceda6ff..d618a8b 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
@@ -54,8 +54,8 @@ public class MavenITmng3667ResolveDepsWithBadPomVersionTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3667" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java
----------------------------------------------------------------------
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 3000026..56eb32d 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
@@ -52,8 +52,8 @@ public class MavenITmng3680InvalidDependencyPOMTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3680" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java
----------------------------------------------------------------------
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 4037638..45381a1 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
@@ -50,8 +50,8 @@ public class MavenITmng3701ImplicitProfileIdTest
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java
----------------------------------------------------------------------
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 5f1617c..67bdd78 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
@@ -61,7 +61,7 @@ public class MavenITmng3714ToolchainsCliOptionTest
 
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "--toolchains toolchains.xml" );
+        verifier.addCliOption( "--toolchains toolchains.xml" );
         verifier.executeGoal( "initialize" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java
----------------------------------------------------------------------
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 77cc4ce..b6f137f 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
@@ -55,9 +55,9 @@ public class MavenITmng3732ActiveProfilesTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
-        verifier.getCliOptions().add( "-Ppom,profiles,settings" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
+        verifier.addCliOption( "-Ppom,profiles,settings" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java
----------------------------------------------------------------------
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 10ab4d2..57fc0ce 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
@@ -83,9 +83,9 @@ public class MavenITmng3746POMPropertyOverrideTest
         verifier = newVerifier( projectDir.getAbsolutePath() );
         verifier.setLogFileName( "log-cli.txt" );
         
-        verifier.getCliOptions().add( "-Dtest.verification=cli" );
-        verifier.getCliOptions().add( "-Dtest.usingCliValue=true" );
-        verifier.getCliOptions().add( "-Djava.version=cli" );
+        verifier.addCliOption( "-Dtest.verification=cli" );
+        verifier.addCliOption( "-Dtest.usingCliValue=true" );
+        verifier.addCliOption( "-Djava.version=cli" );
         
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java
----------------------------------------------------------------------
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 1ddea0a..a32ce0a 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
@@ -51,8 +51,8 @@ public class MavenITmng3748BadSettingsXmlTest
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );     
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
 
         // Maven 3.x will only print warnings (see MNG-4390)
         if ( matchesVersionRange( "(,3.0-alpha-3)" ) )

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
index 4a9c60a..61c36f2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
@@ -71,7 +71,7 @@ public class MavenITmng3760BaseUriPropertyTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-DbaseUri=myBaseUri" );
+        verifier.addCliOption( "-DbaseUri=myBaseUri" );
         verifier.setLogFileName( "log-sysprop.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java
----------------------------------------------------------------------
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 594f807..970d415 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
@@ -50,8 +50,8 @@ public class MavenITmng3766ToolchainsFromExtensionTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "--toolchains" );
-        verifier.getCliOptions().add( "toolchains.xml" );
+        verifier.addCliOption( "--toolchains" );
+        verifier.addCliOption( "toolchains.xml" );
         verifier.executeGoal( "initialize" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java
----------------------------------------------------------------------
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 e8d640f..37eb3e1 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
@@ -54,8 +54,8 @@ public class MavenITmng3769ExclusionRelocatedTransdepsTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3769" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java
----------------------------------------------------------------------
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 88665f1..7341c94 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
@@ -89,8 +89,8 @@ public class MavenITmng3775ConflictResolutionBacktrackingTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3775" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java
----------------------------------------------------------------------
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 f9770e8..2192236 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
@@ -53,8 +53,8 @@ public class MavenITmng3805ExtensionClassPathOrderingTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3805" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java
----------------------------------------------------------------------
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 5599424..c962122 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
@@ -53,8 +53,8 @@ public class MavenITmng3813PluginClassPathOrderingTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3813" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java
----------------------------------------------------------------------
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 15c29ef..556ff21 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
@@ -51,8 +51,8 @@ public class MavenITmng3814BogusProjectCycleTest
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3814" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
----------------------------------------------------------------------
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 b3edf4e..2bec145 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
@@ -60,8 +60,8 @@ public class MavenITmng3843PomInheritanceTest
         verifier.deleteDirectory( "test-2/child-1/target" );
         verifier.deleteDirectory( "test-2/child-2/target" );
         verifier.deleteDirectory( "test-3/sub-parent/child-a/target" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java
----------------------------------------------------------------------
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 1081f7b..aad36bb 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
@@ -55,7 +55,7 @@ public class MavenITmng3853ProfileInjectedDistReposTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-Pcoreit" );
+        verifier.addCliOption( "-Pcoreit" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java
----------------------------------------------------------------------
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 bd8debb..4464d8b 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
@@ -54,8 +54,8 @@ public class MavenITmng3872ProfileActivationInRelocatedPomTest
         verifier.deleteArtifacts( "org.apache.maven.its.mng3872" );
         Properties filterProps = verifier.newDefaultFilterProperties();
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java
index 566ea1a..b619400 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java
@@ -54,7 +54,7 @@ public class MavenITmng3885UniqueVersionFromParentProfileTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "repo-f" );
         verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-Pnon-unique-version" );
+        verifier.addCliOption( "-Pnon-unique-version" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
@@ -76,7 +76,7 @@ public class MavenITmng3885UniqueVersionFromParentProfileTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "repo-f" );
         verifier.filterFile( "../pom-template.xml", "../pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-Pnon-unique-version" );
+        verifier.addCliOption( "-Pnon-unique-version" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
@@ -98,7 +98,7 @@ public class MavenITmng3885UniqueVersionFromParentProfileTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "repo-t" );
         verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-Punique-version" );
+        verifier.addCliOption( "-Punique-version" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
@@ -121,7 +121,7 @@ public class MavenITmng3885UniqueVersionFromParentProfileTest
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "repo-t" );
         verifier.filterFile( "../pom-template.xml", "../pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-Punique-version" );
+        verifier.addCliOption( "-Punique-version" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java
----------------------------------------------------------------------
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 5dd3648..041356d 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
@@ -52,8 +52,8 @@ public class MavenITmng3890TransitiveDependencyScopeUpdateTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3890" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java
----------------------------------------------------------------------
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 efb3c1c..424fb72 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
@@ -53,8 +53,8 @@ public class MavenITmng3899ExtensionInheritanceTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3899" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java
----------------------------------------------------------------------
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 f6e0ea4..0794c83 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
@@ -51,7 +51,7 @@ public class MavenITmng3900ProfilePropertiesInterpolationTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-Pinterpolation-profile" );
+        verifier.addCliOption( "-Pinterpolation-profile" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java
----------------------------------------------------------------------
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 2916989..ac20d3d 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
@@ -53,8 +53,8 @@ public class MavenITmng3906MergedPluginClassPathOrderingTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3906" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java
----------------------------------------------------------------------
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 96153b2..c50db1a 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
@@ -50,8 +50,8 @@ public class MavenITmng3944BasedirInterpolationTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-f" );
-        verifier.getCliOptions().add( "pom-with-unusual-name.xml" );
+        verifier.addCliOption( "-f" );
+        verifier.addCliOption( "pom-with-unusual-name.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java
----------------------------------------------------------------------
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 cdeeaf5..3331415 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
@@ -152,9 +152,9 @@ public class MavenITmng3953AuthenticatedDeploymentTest
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
-        verifier.getCliOptions().add( "-DdeploymentPort=" + port );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
+        verifier.addCliOption( "-DdeploymentPort=" + port );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java
----------------------------------------------------------------------
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 7b78f06..21fd877 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
@@ -51,10 +51,10 @@ public class MavenITmng3955EffectiveSettingsTest
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
-        verifier.getCliOptions().add( "--offline" );
-        verifier.getCliOptions().add( "--batch-mode" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
+        verifier.addCliOption( "--offline" );
+        verifier.addCliOption( "--batch-mode" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java
----------------------------------------------------------------------
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 311779d..beed120 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
@@ -94,8 +94,8 @@ public class MavenITmng3970DepResolutionFromProfileReposTest
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3970" );
         verifier.filterFile( "settings.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java
----------------------------------------------------------------------
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 1a150c0..1432869 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
@@ -52,8 +52,8 @@ public class MavenITmng3974MirrorOrderingTest
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3974" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java
----------------------------------------------------------------------
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 f32bf5d..6200495 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
@@ -100,8 +100,8 @@ public class MavenITmng3983PluginResolutionFromProfileReposTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3983" );
         verifier.filterFile( "settings.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java
----------------------------------------------------------------------
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 c829334..571575f 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
@@ -51,7 +51,7 @@ public class MavenITmng4009InheritProfileEffectsTest
         Verifier verifier = newVerifier( new File( testDir, "sub" ).getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-Pparent-profile" );
+        verifier.addCliOption( "-Pparent-profile" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java
----------------------------------------------------------------------
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 487a9fa..eaa53b1 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
@@ -51,7 +51,7 @@ public class MavenITmng4022IdempotentPluginConfigMergingTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-Pmng4022a,mng4022b" );
+        verifier.addCliOption( "-Pmng4022a,mng4022b" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java
----------------------------------------------------------------------
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 05b66dc..920ed5c 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
@@ -50,8 +50,8 @@ public class MavenITmng4036ParentResolutionFromSettingsRepoTest
         verifier.setAutoclean( false );
         verifier.filterFile( "settings.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4036" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
@@ -74,8 +74,8 @@ public class MavenITmng4036ParentResolutionFromSettingsRepoTest
         verifier.setAutoclean( false );
         verifier.filterFile( "settings.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4036" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java
----------------------------------------------------------------------
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 24406aa..37082d0 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
@@ -119,8 +119,8 @@ public class MavenITmng4068AuthenticatedMirrorTest
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4068" );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java
----------------------------------------------------------------------
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 fd62f5d..a077f5c 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
@@ -53,8 +53,8 @@ public class MavenITmng4070WhitespaceTrimmingTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4070" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java
----------------------------------------------------------------------
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 aee31ee..3a26147 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
@@ -54,8 +54,8 @@ public class MavenITmng4072InactiveProfileReposTest
         verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", filterProps );
         verifier.filterFile( "profiles-template.xml", "profiles.xml", "UTF-8", filterProps );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         try
         {
             verifier.executeGoal( "validate" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java
index adee69b..c9310e8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java
@@ -53,8 +53,8 @@ public class MavenITmng4086ExplicitPluginMetaversionTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4086" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.setLogFileName( "log-release.txt" );
         verifier.executeGoal( "org.apache.maven.its.mng4086:maven-it-plugin-a:RELEASE:touch" );
         verifier.verifyErrorFreeLog();
@@ -78,8 +78,8 @@ public class MavenITmng4086ExplicitPluginMetaversionTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4086" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.setLogFileName( "log-latest.txt" );
         verifier.executeGoal( "org.apache.maven.its.mng4086:maven-it-plugin-a:LATEST:touch" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java
----------------------------------------------------------------------
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 abf51de..ea029b3 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
@@ -52,9 +52,9 @@ public class MavenITmng4106InterpolationUsesDominantProfileTest
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
-        verifier.getCliOptions().add( "-Ppom-a,pom-b,profiles-a,profiles-b,settings-a,settings-b" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
+        verifier.addCliOption( "-Ppom-a,pom-b,profiles-a,profiles-b,settings-a,settings-b" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java
----------------------------------------------------------------------
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 3dc9ce4..6015815 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
@@ -52,8 +52,8 @@ public class MavenITmng4107InterpolationUsesDominantProfileSourceTest
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java
index 47f7cfa..efb4737 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java
@@ -55,8 +55,8 @@ public class MavenITmng4148DepPomInterpWithSettingsProfilesTest
         
         verifier.setAutoclean( false );
         
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java
----------------------------------------------------------------------
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 6750036..31e8e5e 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
@@ -52,8 +52,8 @@ public class MavenITmng4150VersionRangeTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4150" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java
----------------------------------------------------------------------
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 fdbc704..cfa481d 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
@@ -55,8 +55,8 @@ public class MavenITmng4166HideCoreCommonsCliTest
         verifier.deleteArtifact( "commons-cli", "commons-cli", "0.1.4166", "jar" );
         verifier.deleteArtifact( "commons-cli", "commons-cli", "0.1.4166", "pom" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java
----------------------------------------------------------------------
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 3475f6a..b9ac919 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
@@ -55,8 +55,8 @@ public class MavenITmng4180PerDependencyExclusionsTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4180" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
@@ -64,7 +64,7 @@ public class MavenITmng4180PerDependencyExclusionsTest
         List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
         Collections.sort( artifacts );
 
-        List<String> expected = new ArrayList();
+        List<String> expected = new ArrayList<String>();
         expected.add( "org.apache.maven.its.mng4180:a:jar:0.1" );
         expected.add( "org.apache.maven.its.mng4180:b:jar:0.1" );
         expected.add( "org.apache.maven.its.mng4180:c:jar:0.1" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
----------------------------------------------------------------------
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 bd5f722..9e9d799 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
@@ -49,8 +49,8 @@ public class MavenITmng4189UniqueVersionSnapshotTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4189" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
 
         // depend on org.apache.maven.its.mng4189:dep:1.0-20090608.090416-1:jar 
         verifier.setLogFileName( "log-1.txt" );
@@ -62,8 +62,8 @@ public class MavenITmng4189UniqueVersionSnapshotTest
 
         // depend on org.apache.maven.its.mng4189:dep:1.0-20090608.090416-2:jar 
         verifier.deleteDirectory( "target" );
-        verifier.getCliOptions().add( "-f" );
-        verifier.getCliOptions().add( "dependent-on-newer-timestamp-pom.xml" );
+        verifier.addCliOption( "-f" );
+        verifier.addCliOption( "dependent-on-newer-timestamp-pom.xml" );
         verifier.setLogFileName( "log-2.txt" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java
----------------------------------------------------------------------
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 b8479ac..a73c053 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
@@ -57,8 +57,8 @@ public class MavenITmng4190MirrorRepoMergingTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4190" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
@@ -66,7 +66,7 @@ public class MavenITmng4190MirrorRepoMergingTest
         List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
         Collections.sort( artifacts );
 
-        List<String> expected = new ArrayList();
+        List<String> expected = new ArrayList<String>();
         expected.add( "org.apache.maven.its.mng4190:a:jar:0.1" );
         expected.add( "org.apache.maven.its.mng4190:b:jar:0.1-SNAPSHOT" );
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java
----------------------------------------------------------------------
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 81f275a..726d58d 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
@@ -62,8 +62,8 @@ public class MavenITmng4199CompileMeetsRuntimeScopeTest
         Properties filterProps = verifier.newDefaultFilterProperties();
         verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", filterProps );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-        verifier.getCliOptions().add( "--settings" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "--settings" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java
----------------------------------------------------------------------
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 4d7f768..82d547e 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
@@ -54,8 +54,8 @@ public class MavenITmng4203TransitiveDependencyExclusionTest
         verifier.deleteDirectory( "target" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4203" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c304ba2b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java
----------------------------------------------------------------------
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 4b2f9a0..39cd47c 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
@@ -49,8 +49,8 @@ public class MavenITmng4207PluginWithLog4JTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng4207" );
-        verifier.getCliOptions().add( "-s" );
-        verifier.getCliOptions().add( "settings.xml" );
+        verifier.addCliOption( "-s" );
+        verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "initialize" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();