maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject [6/6] git commit: replaced verifier.getCliOptions().add() with verifier.addCliOption()
Date Mon, 20 May 2013 14:36:50 GMT
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 <hboutemy@apache.org>
Authored: Mon May 20 16:36:37 2013 +0200
Committer: Hervé Boutemy <hboutemy@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();


Mime
View raw message