You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2023/01/05 18:35:09 UTC
[maven-integration-testing] branch master updated: [MNG-7661] Remove deprecated 'verifier.resetStreams()'
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
The following commit(s) were added to refs/heads/master by this push:
new 7556cdd5a [MNG-7661] Remove deprecated 'verifier.resetStreams()'
7556cdd5a is described below
commit 7556cdd5a250818152fd968038a0f082fda167b4
Author: Petr Široký <pe...@pm.me>
AuthorDate: Wed Jan 4 16:35:28 2023 +0100
[MNG-7661] Remove deprecated 'verifier.resetStreams()'
* the method itself is empty in newer versions of verifier,
so this change is not removing any behavior
---
.../src/test/java/org/apache/maven/it/ItUtils.java | 1 -
.../maven/it/MavenIT0008SimplePluginTest.java | 1 -
.../maven/it/MavenIT0009GoalConfigurationTest.java | 1 -
...MavenIT0010DependencyClosureResolutionTest.java | 1 -
...11DefaultVersionByDependencyManagementTest.java | 1 -
.../maven/it/MavenIT0012PomInterpolationTest.java | 1 -
.../it/MavenIT0018DependencyManagementTest.java | 1 -
...MavenIT0019PluginVersionMgmtBySuperPomTest.java | 1 -
.../apache/maven/it/MavenIT0021PomProfileTest.java | 1 -
.../maven/it/MavenIT0023SettingsProfileTest.java | 1 -
.../it/MavenIT0024MultipleGoalExecutionsTest.java | 1 -
...venIT0025MultipleExecutionLevelConfigsTest.java | 1 -
.../MavenIT0030DepPomDepMgmtInheritanceTest.java | 1 -
.../maven/it/MavenIT0032MavenPrerequisiteTest.java | 1 -
.../it/MavenIT0037AlternatePomFileSameDirTest.java | 1 -
...avenIT0038AlternatePomFileDifferentDirTest.java | 1 -
...avenIT0040PackagingFromPluginExtensionTest.java | 1 -
...nIT0041ArtifactTypeFromPluginExtensionTest.java | 1 -
.../maven/it/MavenIT0051ReleaseProfileTest.java | 1 -
.../maven/it/MavenIT0052ReleaseProfileTest.java | 1 -
.../it/MavenIT0056MultipleGoalExecutionsTest.java | 1 -
.../it/MavenIT0063SystemScopeDependencyTest.java | 1 -
.../it/MavenIT0064MojoConfigViaSettersTest.java | 1 -
...enIT0071PluginConfigWithDottedPropertyTest.java | 1 -
...nIT0072InterpolationWithDottedPropertyTest.java | 1 -
.../it/MavenIT0085TransitiveSystemScopeTest.java | 1 -
.../maven/it/MavenIT0086PluginRealmTest.java | 1 -
...nIT0087PluginRealmWithProjectLevelDepsTest.java | 1 -
.../it/MavenIT0090EnvVarInterpolationTest.java | 1 -
.../maven/it/MavenIT0108SnapshotUpdateTest.java | 9 --
...ServerAuthzAvailableToWagonMgrInPluginTest.java | 1 -
.../maven/it/MavenIT0130CleanLifecycleTest.java | 1 -
.../maven/it/MavenIT0131SiteLifecycleTest.java | 1 -
.../maven/it/MavenIT0132PomLifecycleTest.java | 1 -
.../maven/it/MavenIT0133JarLifecycleTest.java | 1 -
.../maven/it/MavenIT0134WarLifecycleTest.java | 1 -
.../maven/it/MavenIT0135EjbLifecycleTest.java | 1 -
.../maven/it/MavenIT0136RarLifecycleTest.java | 1 -
.../maven/it/MavenIT0137EarLifecycleTest.java | 1 -
.../maven/it/MavenIT0138PluginLifecycleTest.java | 1 -
...enIT0139InterpolationWithProjectPrefixTest.java | 1 -
.../MavenIT0140InterpolationWithPomPrefixTest.java | 1 -
.../it/MavenIT0142DirectDependencyScopesTest.java | 1 -
.../MavenIT0143TransitiveDependencyScopesTest.java | 1 -
.../it/MavenIT0144LifecycleExecutionOrderTest.java | 1 -
.../it/MavenIT0146InstallerSnapshotNaming.java | 3 -
.../maven/it/MavenIT0199CyclicImportScopeTest.java | 1 -
.../org/apache/maven/it/MavenITBootstrapTest.java | 1 -
.../MavenITmng0095ReactorFailureBehaviorTest.java | 3 -
.../it/MavenITmng0187CollectedProjectsTest.java | 1 -
.../MavenITmng0249ResolveDepsFromReactorTest.java | 1 -
...82NonReactorExecWhenProjectIndependentTest.java | 1 -
...venITmng0294MergeGlobalAndUserSettingsTest.java | 1 -
.../MavenITmng0377PluginLookupFromPrefixTest.java | 1 -
.../MavenITmng0449PluginVersionResolutionTest.java | 2 -
...nITmng0461TolerateMissingDependencyPomTest.java | 1 -
.../maven/it/MavenITmng0469ReportConfigTest.java | 2 -
.../it/MavenITmng0471CustomLifecycleTest.java | 1 -
.../it/MavenITmng0479OverrideCentralRepoTest.java | 6 -
...ITmng0496IgnoreUnknownPluginParametersTest.java | 1 -
.../maven/it/MavenITmng0505VersionRangeTest.java | 1 -
.../it/MavenITmng0507ArtifactRelocationTest.java | 1 -
...avenITmng0522InheritedPluginMgmtConfigTest.java | 1 -
.../MavenITmng0553SettingsAuthzEncryptionTest.java | 4 -
.../MavenITmng0557UserSettingsCliOptionTest.java | 1 -
.../MavenITmng0612NewestConflictResolverTest.java | 3 -
.../it/MavenITmng0666IgnoreLegacyPomTest.java | 1 -
.../it/MavenITmng0674PluginParameterAliasTest.java | 2 -
.../maven/it/MavenITmng0680ParentBasedirTest.java | 1 -
.../MavenITmng0761MissingSnapshotDistRepoTest.java | 1 -
.../maven/it/MavenITmng0768OfflineModeTest.java | 3 -
...mng0773SettingsProfileReactorPollutionTest.java | 1 -
...MavenITmng0781PluginConfigVsExecConfigTest.java | 1 -
.../it/MavenITmng0786ProfileAwareReactorTest.java | 1 -
...avenITmng0814ExplicitProfileActivationTest.java | 1 -
.../it/MavenITmng0818WarDepsNotTransitiveTest.java | 1 -
.../it/MavenITmng0820ConflictResolutionTest.java | 1 -
.../it/MavenITmng0823MojoContextPassingTest.java | 1 -
...avenITmng0828PluginConfigValuesInDebugTest.java | 1 -
.../MavenITmng0836PluginParentResolutionTest.java | 2 -
...g0848UserPropertyOverridesDefaultValueTest.java | 1 -
.../it/MavenITmng0866EvaluateDefaultValueTest.java | 1 -
...enITmng0870ReactorAwarePluginDiscoveryTest.java | 1 -
.../it/MavenITmng0947OptionalDependencyTest.java | 1 -
...onentInjectionViaProjectLevelPluginDepTest.java | 1 -
...venITmng0985NonExecutedPluginMgmtGoalsTest.java | 1 -
...venITmng1021EqualAttachmentBuildNumberTest.java | 1 -
.../it/MavenITmng1052PluginMgmtConfigTest.java | 1 -
.../MavenITmng1073AggregatorForksReactorTest.java | 2 -
.../MavenITmng1088ReactorPluginResolutionTest.java | 1 -
...MavenITmng1142VersionRangeIntersectionTest.java | 1 -
.../it/MavenITmng1144MultipleDefaultGoalsTest.java | 1 -
.../MavenITmng1233WarDepWithProvidedScopeTest.java | 1 -
.../it/MavenITmng1323AntrunDependenciesTest.java | 1 -
.../it/MavenITmng1349ChecksumFormatsTest.java | 1 -
.../it/MavenITmng1412DependenciesOrderTest.java | 1 -
.../MavenITmng1415QuotedSystemPropertiesTest.java | 1 -
.../it/MavenITmng1701DuplicatePluginTest.java | 1 -
...MavenITmng1703PluginMgmtDepInheritanceTest.java | 1 -
...51ForcedMetadataUpdateDuringDeploymentTest.java | 2 -
...03PomValidationErrorIncludesLineNumberTest.java | 4 -
.../MavenITmng1895ScopeConflictResolutionTest.java | 2 -
...ITmng1957JdkActivationWithVersionRangeTest.java | 1 -
...venITmng1992SystemPropOverridesPomPropTest.java | 1 -
...mng1995InterpolateBooleanModelElementsTest.java | 1 -
...nITmng2006ChildPathAwareUrlInheritanceTest.java | 1 -
...2045testJarDependenciesBrokenInReactorTest.java | 1 -
...terpolateWithSettingsProfilePropertiesTest.java | 1 -
...venITmng2054PluginExecutionInheritanceTest.java | 1 -
.../MavenITmng2068ReactorRelativeParentsTest.java | 3 -
...2098VersionRangeSatisfiedFromWrongRepoTest.java | 1 -
...venITmng2103PluginExecutionInheritanceTest.java | 1 -
.../MavenITmng2123VersionRangeDependencyTest.java | 1 -
...ng2124PomInterpolationWithParentValuesTest.java | 1 -
...nITmng2130ParentLookupFromReactorCacheTest.java | 1 -
.../it/MavenITmng2135PluginBuildInReactorTest.java | 1 -
.../MavenITmng2136ActiveByDefaultProfileTest.java | 1 -
...g2140ReactorAwareDepResolutionWhenForkTest.java | 1 -
...ng2174PluginDepsManagedByParentProfileTest.java | 1 -
.../it/MavenITmng2196ParentResolutionTest.java | 2 -
.../it/MavenITmng2199ParentVersionRangeTest.java | 178 ++++++---------------
...avenITmng2201PluginConfigInterpolationTest.java | 1 -
...ng2222OutputDirectoryReactorResolutionTest.java | 1 -
.../it/MavenITmng2228ComponentInjectionTest.java | 1 -
...venITmng2234ActiveProfilesFromSettingsTest.java | 1 -
.../maven/it/MavenITmng2254PomEncodingTest.java | 1 -
...276ProfileActivationBySettingsPropertyTest.java | 2 -
.../MavenITmng2293CustomPluginParamImplTest.java | 1 -
.../it/MavenITmng2305MultipleProxiesTest.java | 1 -
.../MavenITmng2309ProfileInjectionOrderTest.java | 1 -
.../MavenITmng2318LocalParentResolutionTest.java | 1 -
.../MavenITmng2339BadProjectInterpolationTest.java | 3 -
.../it/MavenITmng2362DeployedPomEncodingTest.java | 1 -
...avenITmng2363BasedirAwareFileActivatorTest.java | 1 -
.../maven/it/MavenITmng2387InactiveProxyTest.java | 1 -
.../it/MavenITmng2432PluginPrefixOrderTest.java | 1 -
...estampedDependencyVersionInterpolationTest.java | 4 -
.../maven/it/MavenITmng2562Timestamp322Test.java | 3 -
.../it/MavenITmng2576MakeLikeReactorTest.java | 9 --
...MavenITmng2577SettingsXmlInterpolationTest.java | 2 -
...venITmng2591MergeInheritedPluginConfigTest.java | 1 -
.../MavenITmng2605BogusProfileActivationTest.java | 1 -
...mng2668UsePluginDependenciesForSortingTest.java | 1 -
.../it/MavenITmng2690MojoLoadingErrorsTest.java | 16 --
.../it/MavenITmng2693SitePluginRealmTest.java | 1 -
.../MavenITmng2695OfflinePluginSnapshotsTest.java | 2 -
...avenITmng2720SiblingClasspathArtifactsTest.java | 1 -
...Tmng2738ProfileIdCollidesWithCliOptionTest.java | 1 -
...venITmng2739RequiredRepositoryElementsTest.java | 2 -
...41PluginMetadataResolutionErrorMessageTest.java | 4 -
.../it/MavenITmng2744checksumVerificationTest.java | 1 -
...venITmng2749ExtensionAvailableToPluginTest.java | 1 -
...ITmng2771PomExtensionComponentOverrideTest.java | 3 -
.../it/MavenITmng2790LastUpdatedMetadataTest.java | 2 -
.../maven/it/MavenITmng2820PomCommentsTest.java | 1 -
...ustomArtifactHandlerAndCustomLifecycleTest.java | 1 -
...mng2843PluginConfigPropertiesInjectionTest.java | 1 -
...ProfileActivationByEnvironmentVariableTest.java | 1 -
.../maven/it/MavenITmng2865MirrorWildcardTest.java | 1 -
...mng2871PrePackageSubartifactResolutionTest.java | 1 -
.../it/MavenITmng2892HideCorePlexusUtilsTest.java | 1 -
.../MavenITmng2921ActiveAttachedArtifactsTest.java | 1 -
.../it/MavenITmng2926PluginPrefixOrderTest.java | 3 -
...MavenITmng2972OverridePluginDependencyTest.java | 2 -
.../MavenITmng2994SnapshotRangeRepositoryTest.java | 1 -
...004ReactorFailureBehaviorMultithreadedTest.java | 5 -
.../it/MavenITmng3012CoreClassImportTest.java | 1 -
...enITmng3023ReactorDependencyResolutionTest.java | 7 -
.../MavenITmng3038TransitiveDepManVersionTest.java | 2 -
...enITmng3043BestEffortReactorResolutionTest.java | 2 -
.../it/MavenITmng3052DepRepoAggregationTest.java | 1 -
...g3092SnapshotsExcludedFromVersionRangeTest.java | 1 -
...avenITmng3099SettingsProfilesWithNoPomTest.java | 1 -
.../it/MavenITmng3118TestClassPathOrderTest.java | 1 -
...venITmng3122ActiveProfilesNoDuplicatesTest.java | 1 -
...UrlNormalizationNotBeforeInterpolationTest.java | 1 -
...3139UseCachedMetadataOfBlacklistedRepoTest.java | 2 -
.../maven/it/MavenITmng3183LoggingToFileTest.java | 1 -
.../MavenITmng3203DefaultLifecycleExecIdTest.java | 1 -
...venITmng3208ProfileAwareReactorSortingTest.java | 1 -
.../MavenITmng3217InterPluginDependencyTest.java | 1 -
.../maven/it/MavenITmng3220ImportScopeTest.java | 2 -
...ITmng3259DepsDroppedInMultiModuleBuildTest.java | 2 -
...venITmng3268MultipleHyphenPCommandLineTest.java | 1 -
.../it/MavenITmng3284UsingCachedPluginsTest.java | 2 -
.../maven/it/MavenITmng3288SystemScopeDirTest.java | 1 -
...enITmng3297DependenciesNotLeakedToMojoTest.java | 1 -
.../it/MavenITmng3314OfflineSnapshotsTest.java | 2 -
.../MavenITmng3331ModulePathNormalizationTest.java | 12 --
...enITmng3355TranslatedPathInterpolationTest.java | 1 -
...avenITmng3372DirectInvocationOfPluginsTest.java | 4 -
...avenITmng3379ParallelArtifactDownloadsTest.java | 1 -
...avenITmng3380ManagedRelocatedTransdepsTest.java | 1 -
...avenITmng3394POMPluginVersionDominanceTest.java | 2 -
...encyManagementForOverConstrainedRangesTest.java | 3 -
.../it/MavenITmng3401CLIDefaultExecIdTest.java | 1 -
.../MavenITmng3415JunkRepositoryMetadataTest.java | 2 -
...avenITmng3422ActiveComponentCollectionTest.java | 1 -
...etadataUpdatedFromDeploymentRepositoryTest.java | 1 -
.../maven/it/MavenITmng3461MirrorMatchingTest.java | 3 -
...ictChecksumVerificationOfDependencyPomTest.java | 44 +++--
.../maven/it/MavenITmng3475BaseAlignedDirTest.java | 1 -
...ng3477DependencyResolutionErrorMessageTest.java | 4 -
...venITmng3482DependencyPomInterpolationTest.java | 1 -
.../MavenITmng3485OverrideWagonExtensionTest.java | 1 -
.../it/MavenITmng3498ForkToOtherMojoTest.java | 2 -
.../maven/it/MavenITmng3503Xpp3ShadingTest.java | 2 -
...enITmng3506ArtifactHandlersFromPluginsTest.java | 1 -
.../maven/it/MavenITmng3529QuotedCliArgTest.java | 1 -
...avenITmng3535SelfReferentialPropertiesTest.java | 3 -
.../MavenITmng3536AppendedAbsolutePathsTest.java | 2 -
.../it/MavenITmng3545ProfileDeactivationTest.java | 6 -
...5HexadecimalOctalPluginParameterConfigTest.java | 1 -
...avenITmng3581PluginUsesWagonDependencyTest.java | 1 -
...enITmng3586SystemScopePluginDependencyTest.java | 2 -
...MavenITmng3599useHttpProxyForWebDAVMk2Test.java | 4 -
.../MavenITmng3600DeploymentModeDefaultsTest.java | 3 -
...MavenITmng3607ClassLoadersUseValidUrlsTest.java | 1 -
.../it/MavenITmng3621UNCInheritedPathsTest.java | 1 -
...MavenITmng3641ProfileActivationWarningTest.java | 6 -
.../it/MavenITmng3642DynamicResourcesTest.java | 6 -
.../maven/it/MavenITmng3645POMSyntaxErrorTest.java | 4 -
.../it/MavenITmng3652UserAgentHeaderTest.java | 10 --
...nITmng3667ResolveDepsWithBadPomVersionTest.java | 1 -
...enITmng3671PluginLevelDepInterpolationTest.java | 6 -
...avenITmng3679PluginExecIdInterpolationTest.java | 1 -
.../it/MavenITmng3680InvalidDependencyPOMTest.java | 1 -
.../it/MavenITmng3684BuildPluginParameterTest.java | 3 -
.../it/MavenITmng3693PomFileBasedirChangeTest.java | 2 -
.../MavenITmng3694ReactorProjectsDynamismTest.java | 2 -
.../it/MavenITmng3701ImplicitProfileIdTest.java | 1 -
...g3703ExecutionProjectWithRelativePathsTest.java | 4 -
.../MavenITmng3710PollutedClonedPluginsTest.java | 4 -
.../it/MavenITmng3714ToolchainsCliOptionTest.java | 1 -
.../it/MavenITmng3716AggregatorForkingTest.java | 2 -
.../it/MavenITmng3719PomExecutionOrderingTest.java | 1 -
.../MavenITmng3723ConcreteParentProjectTest.java | 2 -
.../it/MavenITmng3724ExecutionProjectSyncTest.java | 2 -
.../it/MavenITmng3729MultiForkAggregatorsTest.java | 2 -
.../maven/it/MavenITmng3732ActiveProfilesTest.java | 1 -
...Tmng3740SelfReferentialReactorProjectsTest.java | 2 -
.../it/MavenITmng3746POMPropertyOverrideTest.java | 4 -
.../MavenITmng3747PrefixedPathExpressionTest.java | 1 -
.../maven/it/MavenITmng3748BadSettingsXmlTest.java | 2 -
.../MavenITmng3766ToolchainsFromExtensionTest.java | 1 -
...enITmng3769ExclusionRelocatedTransdepsTest.java | 1 -
...Tmng3775ConflictResolutionBacktrackingTest.java | 1 -
...MavenITmng3796ClassImportInconsistencyTest.java | 1 -
...venITmng3805ExtensionClassPathOrderingTest.java | 1 -
...ng3807PluginConfigExpressionEvaluationTest.java | 1 -
...avenITmng3808ReportInheritanceOrderingTest.java | 1 -
.../it/MavenITmng3810BadProfileActivationTest.java | 1 -
...eportingPluginConfigurationInheritanceTest.java | 1 -
.../MavenITmng3813PluginClassPathOrderingTest.java | 1 -
.../it/MavenITmng3814BogusProjectCycleTest.java | 1 -
.../it/MavenITmng3821EqualPluginExecIdsTest.java | 1 -
...enITmng3822BasedirAlignedInterpolationTest.java | 1 -
.../maven/it/MavenITmng3827PluginConfigTest.java | 1 -
.../it/MavenITmng3831PomInterpolationTest.java | 1 -
...ITmng3833PomInterpolationDataFlowChainTest.java | 1 -
.../MavenITmng3836PluginConfigInheritanceTest.java | 1 -
.../it/MavenITmng3838EqualPluginDepsTest.java | 1 -
.../MavenITmng3839PomParsingCoalesceTextTest.java | 1 -
.../maven/it/MavenITmng3843PomInheritanceTest.java | 1 -
.../MavenITmng3845LimitedPomInheritanceTest.java | 1 -
...enITmng3846PomInheritanceUrlAdjustmentTest.java | 2 -
...g3852PluginConfigWithHeterogeneousListTest.java | 1 -
...MavenITmng3853ProfileInjectedDistReposTest.java | 1 -
.../it/MavenITmng3863AutoPluginGroupIdTest.java | 1 -
.../it/MavenITmng3864PerExecPluginConfigTest.java | 1 -
.../MavenITmng3866PluginConfigInheritanceTest.java | 1 -
...mng3872ProfileActivationInRelocatedPomTest.java | 1 -
.../MavenITmng3873MultipleExecutionGoalsTest.java | 1 -
.../it/MavenITmng3877BasedirAlignedModelTest.java | 1 -
.../it/MavenITmng3886ExecutionGoalsOrderTest.java | 1 -
.../it/MavenITmng3887PluginExecutionOrderTest.java | 1 -
...mng3890TransitiveDependencyScopeUpdateTest.java | 1 -
.../it/MavenITmng3892ReleaseDeploymentTest.java | 1 -
.../it/MavenITmng3899ExtensionInheritanceTest.java | 1 -
...Tmng3900ProfilePropertiesInterpolationTest.java | 1 -
...enITmng3904NestedBuildDirInterpolationTest.java | 1 -
...ITmng3906MergedPluginClassPathOrderingTest.java | 1 -
...venITmng3916PluginExecutionInheritanceTest.java | 1 -
.../MavenITmng3924XmlMarkupInterpolationTest.java | 1 -
...venITmng3925MergedPluginExecutionOrderTest.java | 1 -
...nITmng3927PluginDefaultExecutionConfigTest.java | 1 -
...venITmng3937MergedPluginExecutionGoalsTest.java | 1 -
.../MavenITmng3938MergePluginExecutionsTest.java | 1 -
.../it/MavenITmng3940EnvVarInterpolationTest.java | 1 -
...xecutionProjectRestrictedToForkingMojoTest.java | 1 -
...venITmng3943PluginExecutionInheritanceTest.java | 1 -
.../it/MavenITmng3944BasedirInterpolationTest.java | 1 -
...nITmng3947PluginDefaultExecutionConfigTest.java | 1 -
...ng3948ParentResolutionFromProfileReposTest.java | 1 -
.../maven/it/MavenITmng3951AbsolutePathsTest.java | 1 -
.../MavenITmng3953AuthenticatedDeploymentTest.java | 1 -
.../it/MavenITmng3955EffectiveSettingsTest.java | 1 -
...ITmng3970DepResolutionFromProfileReposTest.java | 2 -
.../maven/it/MavenITmng3974MirrorOrderingTest.java | 1 -
.../maven/it/MavenITmng3979ElementJoinTest.java | 1 -
...ng3983PluginResolutionFromProfileReposTest.java | 2 -
.../it/MavenITmng3991ValidDependencyScopeTest.java | 4 -
.../MavenITmng3998PluginExecutionConfigTest.java | 1 -
.../MavenITmng4000MultiPluginExecutionsTest.java | 2 -
.../it/MavenITmng4005UniqueDependencyKeyTest.java | 1 -
.../MavenITmng4007PlatformFileSeparatorTest.java | 1 -
.../it/MavenITmng4008MergedFilterOrderTest.java | 1 -
.../MavenITmng4009InheritProfileEffectsTest.java | 1 -
...ITmng4016PrefixedPropertyInterpolationTest.java | 1 -
...ITmng4022IdempotentPluginConfigMergingTest.java | 1 -
...ITmng4023ParentProfileOneTimeInjectionTest.java | 1 -
...MavenITmng4026ReactorDependenciesOrderTest.java | 1 -
...MavenITmng4034ManagedProfileDependencyTest.java | 1 -
...ng4036ParentResolutionFromSettingsRepoTest.java | 1 -
.../MavenITmng4040ProfileInjectedModulesTest.java | 1 -
...ITmng4048VersionRangeReactorResolutionTest.java | 1 -
.../MavenITmng4052ReactorAwareImportScopeTest.java | 1 -
.../MavenITmng4053PluginConfigAttributesTest.java | 1 -
...lassifierBasedDepResolutionFromReactorTest.java | 1 -
.../it/MavenITmng4068AuthenticatedMirrorTest.java | 1 -
.../it/MavenITmng4070WhitespaceTrimmingTest.java | 1 -
.../it/MavenITmng4072InactiveProfileReposTest.java | 4 -
.../MavenITmng4087PercentEncodedFileUrlTest.java | 1 -
.../it/MavenITmng4091BadPluginDescriptorTest.java | 5 -
...Tmng4102InheritedPropertyInterpolationTest.java | 1 -
...ng4106InterpolationUsesDominantProfileTest.java | 1 -
...InterpolationUsesDominantProfileSourceTest.java | 1 -
.../it/MavenITmng4112MavenVersionPropertyTest.java | 1 -
.../maven/it/MavenITmng4116UndecodedUrlsTest.java | 1 -
...venITmng4129PluginExecutionInheritanceTest.java | 1 -
.../maven/it/MavenITmng4150VersionRangeTest.java | 1 -
.../it/MavenITmng4162ReportingMigrationTest.java | 1 -
.../it/MavenITmng4166HideCoreCommonsCliTest.java | 1 -
.../it/MavenITmng4172EmptyDependencySetTest.java | 1 -
.../MavenITmng4180PerDependencyExclusionsTest.java | 1 -
.../MavenITmng4189UniqueVersionSnapshotTest.java | 3 -
.../it/MavenITmng4190MirrorRepoMergingTest.java | 1 -
.../maven/it/MavenITmng4193UniqueRepoIdTest.java | 4 -
.../it/MavenITmng4196ExclusionOnPluginDepTest.java | 1 -
...MavenITmng4199CompileMeetsRuntimeScopeTest.java | 1 -
...ITmng4203TransitiveDependencyExclusionTest.java | 1 -
.../it/MavenITmng4207PluginWithLog4JTest.java | 1 -
...nterpolationPrefersCliOverProjectPropsTest.java | 1 -
...avenITmng4214MirroredParentSearchReposTest.java | 1 -
.../it/MavenITmng4231SnapshotUpdatePolicyTest.java | 2 -
...orResolutionForManuallyCreatedArtifactTest.java | 1 -
...enITmng4235HttpAuthDeploymentChecksumsTest.java | 1 -
...ITmng4238ArtifactHandlerExtensionUsageTest.java | 1 -
...nITmng4262MakeLikeReactorDottedPath370Test.java | 2 -
...avenITmng4262MakeLikeReactorDottedPathTest.java | 2 -
...Tmng4269BadReactorResolutionFromOutDirTest.java | 1 -
...Tmng4270ArtifactHandlersFromPluginDepsTest.java | 1 -
...4273RestrictedCoreRealmAccessForPluginTest.java | 1 -
.../it/MavenITmng4274PluginRealmArtifactsTest.java | 1 -
.../it/MavenITmng4275RelocationWarningTest.java | 1 -
...venITmng4276WrongTransitivePlexusUtilsTest.java | 1 -
.../it/MavenITmng4281PreferLocalSnapshotTest.java | 2 -
.../it/MavenITmng4283ParentPomPackagingTest.java | 4 -
.../MavenITmng4291MojoRequiresOnlineModeTest.java | 5 -
.../MavenITmng4292EnumTypeMojoParametersTest.java | 1 -
...mng4293RequiresCompilePlusRuntimeScopeTest.java | 1 -
...venITmng4304ProjectDependencyArtifactsTest.java | 1 -
.../it/MavenITmng4305LocalRepoBasedirTest.java | 1 -
...309StrictChecksumValidationForMetadataTest.java | 1 -
...warePluginParameterExpressionInjectionTest.java | 1 -
...nITmng4314DirectInvocationOfAggregatorTest.java | 1 -
...7PluginVersionResolutionFromMultiReposTest.java | 1 -
.../it/MavenITmng4318ProjectExecutionRootTest.java | 1 -
...ng4319PluginExecutionGoalInterpolationTest.java | 1 -
...avenITmng4320AggregatorAndDependenciesTest.java | 1 -
.../MavenITmng4321CliUsesPluginMgmtConfigTest.java | 1 -
...4326LocalSnapshotSuppressesRemoteCheckTest.java | 2 -
...7ExcludeForkingMojoFromForkedLifecycleTest.java | 1 -
...328PrimitiveMojoParameterConfigurationTest.java | 1 -
.../it/MavenITmng4331DependencyCollectionTest.java | 2 -
...enITmng4332DefaultPluginExecutionOrderTest.java | 1 -
.../it/MavenITmng4335SettingsOfflineModeTest.java | 1 -
.../maven/it/MavenITmng4338OptionalMojosTest.java | 1 -
.../it/MavenITmng4341PluginExecutionOrderTest.java | 1 -
...2IndependentMojoParameterDefaultValuesTest.java | 1 -
...venITmng4343MissingReleaseUpdatePolicyTest.java | 2 -
...enITmng4344ManagedPluginExecutionOrderTest.java | 1 -
...enITmng4345DefaultPluginExecutionOrderTest.java | 1 -
...mng4347ImportScopeWithSettingsProfilesTest.java | 1 -
...ITmng4348NoUnnecessaryRepositoryAccessTest.java | 1 -
...mng4349RelocatedArtifactWithInvalidPomTest.java | 1 -
...Tmng4350LifecycleMappingExecutionOrderTest.java | 1 -
...3PluginDependencyResolutionFromPomRepoTest.java | 1 -
...355ExtensionAutomaticVersionResolutionTest.java | 1 -
...NoNeedlessRelookupFromActiveCollectionTest.java | 1 -
...4357LifecycleMappingDiscoveryInReactorTest.java | 1 -
...LocallyReachableParentOutsideOfReactorTest.java | 1 -
.../maven/it/MavenITmng4360WebDavSupportTest.java | 1 -
...ITmng4361ForceDependencySnapshotUpdateTest.java | 1 -
...363DynamicAdditionOfDependencyArtifactTest.java | 1 -
...avenITmng4365XmlMarkupInAttributeValueTest.java | 1 -
...venITmng4367LayoutAwareMirrorSelectionTest.java | 3 -
...mng4368TimestampAwareArtifactInstallerTest.java | 5 -
...sitiveSystemPathInterpolatedWithEnvVarTest.java | 1 -
...enITmng4381ExtensionSingletonComponentTest.java | 1 -
.../MavenITmng4383ValidDependencyVersionTest.java | 4 -
...LifecycleMappingFromExtensionInReactorTest.java | 1 -
.../maven/it/MavenITmng4386DebugLoggingTest.java | 1 -
.../maven/it/MavenITmng4387QuietLoggingTest.java | 1 -
...nITmng4393ParseExternalParenPomLenientTest.java | 1 -
.../MavenITmng4396AntBased20xMojoSupportTest.java | 1 -
.../it/MavenITmng4400RepositoryOrderTest.java | 2 -
...enITmng4401RepositoryOrderForParentPomTest.java | 1 -
.../it/MavenITmng4402DuplicateChildModuleTest.java | 4 -
...enITmng4403LenientDependencyPomParsingTest.java | 1 -
.../it/MavenITmng4404UniqueProfileIdTest.java | 4 -
.../it/MavenITmng4405ValidPluginVersionTest.java | 4 -
.../MavenITmng4408NonExistentSettingsFileTest.java | 8 -
.../maven/it/MavenITmng4410UsageHelpTest.java | 1 -
.../maven/it/MavenITmng4411VersionInfoTest.java | 1 -
.../it/MavenITmng4412OfflineModeInPluginTest.java | 5 -
...avenITmng4413MirroringOfDependencyRepoTest.java | 1 -
.../it/MavenITmng4415InheritedPluginOrderTest.java | 1 -
...ng4416PluginOrderAfterProfileInjectionTest.java | 1 -
...1DeprecatedPomInterpolationExpressionsTest.java | 1 -
...g4422PluginExecutionPhaseInterpolationTest.java | 1 -
...ssionDataFromPluginParameterExpressionTest.java | 1 -
.../it/MavenITmng4428FollowHttpRedirectTest.java | 1 -
...mng4429CompRequirementOnNonDefaultImplTest.java | 1 -
...nITmng4430DistributionManagementStatusTest.java | 4 -
...avenITmng4433ForceParentSnapshotUpdateTest.java | 1 -
...MavenITmng4436SingletonComponentLookupTest.java | 1 -
...ng4450StubModelForMissingDependencyPomTest.java | 1 -
...4452ResolutionOfSnapshotWithClassifierTest.java | 2 -
...g4453PluginVersionFromLifecycleMappingTest.java | 1 -
...ITmng4459InMemorySettingsKeptEncryptedTest.java | 1 -
.../MavenITmng4461ArtifactUploadMonitorTest.java | 1 -
...463DependencyManagementImportVersionRanges.java | 6 -
...ng4464PlatformIndependentFileSeparatorTest.java | 1 -
...65PluginPrefixFromLocalCacheOfDownRepoTest.java | 2 -
...469AuthenticatedDeploymentToCustomRepoTest.java | 1 -
...Tmng4470AuthenticatedDeploymentToProxyTest.java | 1 -
...enITmng4474PerLookupWagonInstantiationTest.java | 1 -
...9ProjectLevelPluginDepUsedForCliConfigTest.java | 1 -
...avenITmng4482ForcePluginSnapshotUpdateTest.java | 1 -
...mng4488ValidateExternalParenPomLenientTest.java | 1 -
...MavenITmng4489MirroringOfExtensionRepoTest.java | 1 -
.../it/MavenITmng4498IgnoreBrokenMetadataTest.java | 1 -
...Tmng4500NoUpdateOfTimestampedSnapshotsTest.java | 1 -
...4522FailUponMissingDependencyParentPomTest.java | 4 -
...venITmng4526MavenProjectArtifactsScopeTest.java | 1 -
...528ExcludeWagonsFromMavenCoreArtifactsTest.java | 1 -
...nITmng4536RequiresNoProjectForkingMojoTest.java | 1 -
...544ActiveComponentCollectionThreadSafeTest.java | 1 -
...4553CoreArtifactFilterConsidersGroupIdTest.java | 1 -
...avenITmng4554PluginPrefixMappingUpdateTest.java | 3 -
...nITmng4555MetaversionResolutionOfflineTest.java | 1 -
.../MavenITmng4561MirroringOfPluginRepoTest.java | 1 -
...mng4565MultiConditionProfileActivationTest.java | 1 -
...4572ModelVersionSurroundedByWhitespaceTest.java | 1 -
...LevelPluginDepUsedForCliInvocInReactorTest.java | 1 -
...fixResolutionFromVersionlessPluginMgmtTest.java | 1 -
...ImportedPomUsesSystemAndUserPropertiesTest.java | 1 -
...ng4600DependencyOptionalFlagManagementTest.java | 2 -
...mng4615ValidateRequiredPluginParameterTest.java | 5 -
...enITmng4618AggregatorBuiltAfterModulesTest.java | 1 -
...5SettingsXmlInterpolationWithXmlMarkupTest.java | 1 -
...PomValidationErrorUponMissingSystemDepTest.java | 1 -
...mng4633DualCompilerExecutionsWeaveModeTest.java | 1 -
...44StrictPomParsingRejectsMisplacedTextTest.java | 4 -
...Tmng4654ArtifactHandlerForMainArtifactTest.java | 1 -
.../it/MavenITmng4660OutdatedPackagedArtifact.java | 3 -
.../maven/it/MavenITmng4660ResumeFromTest.java | 10 --
.../it/MavenITmng4666CoreRealmImportTest.java | 1 -
...mng4677DisabledPluginConfigInheritanceTest.java | 1 -
.../MavenITmng4679SnapshotUpdateInPluginTest.java | 1 -
...enITmng4684DistMgmtOverriddenByProfileTest.java | 1 -
...ng4690InterdependentConflictResolutionTest.java | 1 -
...mng4696MavenProjectDependencyArtifactsTest.java | 1 -
...4720DependencyManagementExclusionMergeTest.java | 1 -
...MavenITmng4721OptionalPluginDependencyTest.java | 1 -
...729MirrorProxyAuthUsedByProjectBuilderTest.java | 1 -
.../it/MavenITmng4745PluginVersionUpdateTest.java | 3 -
.../MavenITmng4747JavaAgentUsedByPluginTest.java | 1 -
...esolvedMavenProjectDependencyArtifactsTest.java | 1 -
...4755FetchRemoteMetadataForVersionRangeTest.java | 2 -
...enITmng4761PluginLevelDependencyScopesTest.java | 1 -
.../MavenITmng4765LocalPomProjectBuilderTest.java | 1 -
...Tmng4768NearestMatchConflictResolutionTest.java | 1 -
...refixResolutionDoesntTouchDisabledRepoTest.java | 1 -
...rsionResolutionDoesntTouchDisabledRepoTest.java | 1 -
...76ForkedReactorPluginVersionResolutionTest.java | 2 -
...tipleDepsWithVersionRangeFromLocalRepoTest.java | 1 -
...nITmng4781DeploymentToNexusStagingRepoTest.java | 1 -
...4785TransitiveResolutionInForkedThreadTest.java | 1 -
.../MavenITmng4786AntBased21xMojoSupportTest.java | 1 -
...ITmng4788InstallationToCustomLocalRepoTest.java | 1 -
...ITmng4789ScopeInheritanceMeetsConflictTest.java | 1 -
...rojectBuilderResolvesRemotePomArtifactTest.java | 1 -
...utionInReactorProjectForkedByLifecycleTest.java | 1 -
...venITmng4800NearestWinsVsScopeWideningTest.java | 1 -
...enITmng4811CustomComponentConfiguratorTest.java | 1 -
...eResolutionOfDependenciesDuringReactorTest.java | 1 -
.../MavenITmng4829ChecksumFailureWarningTest.java | 1 -
...34ParentProjectResolvedFromRemoteReposTest.java | 1 -
.../it/MavenITmng4840MavenPrerequisiteTest.java | 5 -
...mng4842ParentResolutionOfDependencyPomTest.java | 2 -
...eactorResolutionAttachedWithExclusionsTest.java | 1 -
...avenITmng4874UpdateLatestPluginVersionTest.java | 1 -
.../MavenITmng4877DeployUsingPrivateKeyTest.java | 1 -
...83FailUponOverconstrainedVersionRangesTest.java | 4 -
...ng4890MakeLikeReactorConsidersVersionsTest.java | 2 -
...MavenITmng4891RobustSnapshotResolutionTest.java | 2 -
...g4895PluginDepWithNonRelocatedMavenApiTest.java | 1 -
...913UserPropertyVsDependencyPomPropertyTest.java | 1 -
...g4919LifecycleMappingWithSameGoalTwiceTest.java | 1 -
...4925ContainerLookupRealmDuringMojoExecTest.java | 1 -
.../maven/it/MavenITmng4936EventSpyTest.java | 1 -
...avenITmng4952MetadataReleaseInfoUpdateTest.java | 1 -
...mng4955LocalVsRemoteSnapshotResolutionTest.java | 2 -
.../MavenITmng4960MakeLikeReactorResumeTest.java | 2 -
...venITmng4963ParentResolutionFromMirrorTest.java | 1 -
.../MavenITmng4966AbnormalUrlPreservationTest.java | 1 -
...g4973ExtensionVisibleToPluginInReactorTest.java | 1 -
...975ProfileInjectedPluginExecutionOrderTest.java | 1 -
...mng4987TimestampBasedSnapshotSelectionTest.java | 1 -
.../maven/it/MavenITmng4991NonProxyHostsTest.java | 1 -
...ITmng4992MapStylePropertiesParamConfigTest.java | 1 -
...nITmng5000ChildPathAwareUrlInheritanceTest.java | 1 -
...VersionRangeDependencyParentResolutionTest.java | 1 -
.../it/MavenITmng5009AggregationCycleTest.java | 4 -
...igureCollectionArrayFromUserPropertiesTest.java | 1 -
...Tmng5012CollectionVsArrayParamCoercionTest.java | 1 -
...g5013ConfigureParamBeanFromScalarValueTest.java | 1 -
...ingBasedCompLookupFromChildPluginRealmTest.java | 1 -
.../MavenITmng5064SuppressSnapshotUpdatesTest.java | 1 -
...usionAtDependencyWithImpliedClassifierTest.java | 1 -
...AggregatorDepResolutionModuleExtensionTest.java | 1 -
...Tmng5137ReactorResolutionInForkedBuildTest.java | 1 -
.../maven/it/MavenITmng5175WagonHttpTest.java | 1 -
.../it/MavenITmng5206PlexusLifecycleHonoured.java | 1 -
.../it/MavenITmng5208EventSpyParallelTest.java | 1 -
.../maven/it/MavenITmng5222MojoDeprecatedTest.java | 3 -
.../MavenITmng5230MakeReactorWithExcludesTest.java | 9 --
...g5280SettingsProfilesRepositoriesOrderTest.java | 2 -
.../it/MavenITmng5338FileOptionToDirectory.java | 1 -
.../maven/it/MavenITmng5382Jsr330Plugin.java | 2 -
.../MavenITmng5387ArtifactReplacementPlugin.java | 1 -
...mng5389LifecycleParticipantAfterSessionEnd.java | 2 -
...Tmng5418FileProjectPropertiesActivatorTest.java | 1 -
...445LegacyStringSearchModelInterpolatorTest.java | 1 -
.../maven/it/MavenITmng5482AetherNotFoundTest.java | 4 -
.../maven/it/MavenITmng5503ZipInReactorTest.java | 1 -
.../it/MavenITmng5530MojoExecutionScopeTest.java | 7 -
.../MavenITmng5557ProperlyRestrictedReactor.java | 1 -
...5561PluginRelocationLosesConfigurationTest.java | 3 -
.../MavenITmng5572ReactorPluginExtensionsTest.java | 2 -
.../maven/it/MavenITmng5576CdFriendlyVersions.java | 2 -
.../maven/it/MavenITmng5578SessionScopeTest.java | 9 --
.../it/MavenITmng5581LifecycleMappingDelegate.java | 3 -
.../maven/it/MavenITmng5591WorkspaceReader.java | 2 -
...MavenITmng5608ProfileActivationWarningTest.java | 1 -
...MavenITmng5639ImportScopePomResolutionTest.java | 1 -
...mng5640LifecycleParticipantAfterSessionEnd.java | 10 --
...Tmng5663NestedImportScopePomResolutionTest.java | 1 -
.../maven/it/MavenITmng5669ReadPomsOnce.java | 2 -
.../maven/it/MavenITmng5716ToolchainsTypeTest.java | 1 -
...avenITmng5742BuildExtensionClassloaderTest.java | 2 -
...mng5753CustomMojoExecutionConfiguratorTest.java | 2 -
.../maven/it/MavenITmng5760ResumeFeatureTest.java | 62 ++-----
.../maven/it/MavenITmng5768CliExecutionIdTest.java | 1 -
.../maven/it/MavenITmng5771CoreExtensionsTest.java | 5 -
.../MavenITmng5774ConfigurationProcessorsTest.java | 2 -
.../MavenITmng5783PluginDependencyFiltering.java | 2 -
.../MavenITmng5805PkgTypeMojoConfiguration2.java | 1 -
.../it/MavenITmng5840ParentVersionRanges.java | 4 -
.../MavenITmng5840RelativePathReactorMatching.java | 2 -
...MavenITmng5868NoDuplicateAttachedArtifacts.java | 1 -
.../apache/maven/it/MavenITmng5889FindBasedir.java | 1 -
...enITmng5895CIFriendlyUsageWithPropertyTest.java | 2 -
...ildMultimoduleWithEARFailsToResolveWARTest.java | 1 -
...onalLostInTranstiveManagedDependenciesTest.java | 1 -
.../MavenITmng5958LifecyclePhaseBinaryCompat.java | 2 -
...enITmng5965ParallelBuildMultipliesWorkTest.java | 1 -
.../it/MavenITmng6057CheckReactorOrderTest.java | 1 -
.../it/MavenITmng6071GetResourceWithCustomPom.java | 1 -
.../maven/it/MavenITmng6084Jsr250PluginTest.java | 2 -
.../maven/it/MavenITmng6090CIFriendlyTest.java | 4 -
...uginExecutionConfigurationInterferenceTest.java | 2 -
.../MavenITmng6173GetAllProjectsInReactorTest.java | 1 -
...ITmng6173GetProjectsAndDependencyGraphTest.java | 1 -
...MavenITmng6189SiteReportPluginsWarningTest.java | 1 -
...venITmng6210CoreExtensionsCustomScopesTest.java | 1 -
.../apache/maven/it/MavenITmng6223FindBasedir.java | 1 -
...avenITmng6240PluginExtensionAetherProvider.java | 2 -
.../maven/it/MavenITmng6255FixConcatLines.java | 1 -
...nITmng6256SpecialCharsAlternatePOMLocation.java | 1 -
.../it/MavenITmng6386BaseUriPropertyTest.java | 2 -
.../maven/it/MavenITmng6391PrintVersionTest.java | 2 -
.../it/MavenITmng6506PackageAnnotationTest.java | 2 -
.../MavenITmng6558ToolchainsBuildingEventTest.java | 1 -
.../it/MavenITmng6562WarnDefaultBindings.java | 6 -
...ecuteAnnotationShouldNotReExecuteGoalsTest.java | 3 -
...mng6772NestedImportScopeRepositoryOverride.java | 2 -
...avenITmng6972AllowAccessToGraphPackageTest.java | 2 -
...nITmng7045DropUselessAndOutdatedCdiApiTest.java | 1 -
.../it/MavenITmng7349RelocationWarningTest.java | 2 -
.../it/MavenITmng7353CliGoalInvocationTest.java | 1 -
...ITmng7464ReadOnlyMojoParametersWarningTest.java | 3 -
...nITmng7468UnsupportedPluginsParametersTest.java | 1 -
.../it/MavenITmng7470ResolverTransportTest.java | 1 -
.../maven/it/MavenITmng7474SessionScopeTest.java | 2 -
...mng7504NotWarnUnsupportedReportPluginsTest.java | 1 -
...enITmng7529VersionRangeRepositorySelection.java | 1 -
.../it/MavenITmng7566JavaPrerequisiteTest.java | 5 -
.../maven/it/AbstractMavenIntegrationTestCase.java | 11 +-
.../MavenITmngXXXXDescriptionOfProblemTest.java | 8 -
.../it/MavenITmngXXXXDescriptionOfProblemTest.java | 8 -
613 files changed, 77 insertions(+), 1226 deletions(-)
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 3409467ac..845c63de9 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
* under the License.
*/
-import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.FileInputStream;
import java.security.DigestInputStream;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java
index 790aa7c96..98d7f387c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java
@@ -56,7 +56,6 @@ public class MavenIT0008SimplePluginTest
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFilePresent( "target/test-basedir-alignment/touch.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java
index 326fe0f77..7b4c48371 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java
@@ -57,7 +57,6 @@ public class MavenIT0009GoalConfigurationTest
verifier.verifyFilePresent( "target/goalItem" );
verifier.verifyFileNotPresent( "target/bad-item" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 ed6812d98..3ff4d8eca 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
@@ -57,7 +57,6 @@ public class MavenIT0010DependencyClosureResolutionTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.it0010", "a", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.it0010", "b", "0.2", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java
index bdf828715..a7da9c111 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
@@ -54,7 +54,6 @@ public class MavenIT0011DefaultVersionByDependencyManagementTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.it0011:a:jar:0.1" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java
index 8261b7406..281f28c77 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java
@@ -52,7 +52,6 @@ public class MavenIT0012PomInterpolationTest
verifier.verifyFilePresent( "target/touch-3.8.1.txt" );
verifier.verifyFilePresent( "child-project/target/child-touch-3.0.3.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 a776c4488..60d0585f6 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
@@ -55,7 +55,6 @@ public class MavenIT0018DependencyManagementTest
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
verifier.verifyArtifactPresent( "org.apache.maven.its.it0018", "managed-dep", "1.0.3", "jar" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java
index 7a2550a21..aaaaa8f6b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java
@@ -50,7 +50,6 @@ public class MavenIT0019PluginVersionMgmtBySuperPomTest
verifier.executeGoal( "process-resources" );
verifier.verifyFilePresent( "target/classes/test.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 6b00dc800..31c0b2de6 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
@@ -56,7 +56,6 @@ public class MavenIT0021PomProfileTest
verifier.addCliOption( "-Pprofile-2" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.it0021", "a", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.it0021", "b", "0.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java
index 4c113761f..1f62116e3 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
@@ -53,7 +53,6 @@ public class MavenIT0023SettingsProfileTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/test.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java
index 0b697dc45..15b7fdbf2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java
@@ -57,7 +57,6 @@ public class MavenIT0024MultipleGoalExecutionsTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/plugin-exec-configuration.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java
index 515671847..2b0ceae1a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java
@@ -56,7 +56,6 @@ public class MavenIT0025MultipleExecutionLevelConfigsTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/test.txt" );
verifier.verifyFilePresent( "target/test2.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java
index 85a11677f..02dbea6c6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java
@@ -53,7 +53,6 @@ public class MavenIT0030DepPomDepMgmtInheritanceTest
verifier.executeGoal( "install" );
verifier.verifyFilePresent( "child-hierarchy/project2/target/classes/org/apache/maven/it0001/Person.class" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java
index 0ea450385..7f6aae2e8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java
@@ -49,7 +49,6 @@ public class MavenIT0032MavenPrerequisiteTest
verifier.setAutoclean( false );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 f86f33ada..8f4a46bd7 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
@@ -58,7 +58,6 @@ public class MavenIT0037AlternatePomFileSameDirTest
verifier.addCliOption( "pom2.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/passed.log" );
verifier.verifyFileNotPresent( "target/failed.log" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java
index 5c4022d3b..a66bec546 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
@@ -58,7 +58,6 @@ public class MavenIT0038AlternatePomFileDifferentDirTest
verifier.addCliOption( "project/pom2.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "project/target/passed.log" );
verifier.verifyFileNotPresent( "target/failed.log" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java
index 35f013050..9d0359a15 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java
@@ -57,7 +57,6 @@ public class MavenIT0040PackagingFromPluginExtensionTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/maven-it-it0040-1.0-it.jar" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
index 2327cca30..71cce3dca 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
@@ -58,7 +58,6 @@ public class MavenIT0041ArtifactTypeFromPluginExtensionTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.2", "coreit-artifact" );
verifier.verifyArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.2", "pom" );
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 49150a67d..2733c669f 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
@@ -52,7 +52,6 @@ public class MavenIT0051ReleaseProfileTest
verifier.addCliOption( "-DperformRelease=true" );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/source-jar.txt" );
verifier.verifyFilePresent( "target/javadoc-jar.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java
index bf7a9a4ec..1436ce5d5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java
@@ -51,7 +51,6 @@ public class MavenIT0052ReleaseProfileTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/jar-jar.txt" );
verifier.verifyFileNotPresent( "target/source-jar.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java
index 369917f46..356136e50 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java
@@ -51,7 +51,6 @@ public class MavenIT0056MultipleGoalExecutionsTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/first-exec.txt" );
verifier.verifyFilePresent( "target/second-exec.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java
index 48134b486..83c7f477a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java
@@ -52,7 +52,6 @@ public class MavenIT0063SystemScopeDependencyTest
verifier.getSystemProperties().setProperty( "jre.home", new File( testDir, "jdk/jre" ).getPath() );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> lines = verifier.loadLines( "target/compile.txt", "UTF-8" );
assertEquals( 2, lines.size() );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java
index 180d86819..7798304a1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java
@@ -51,7 +51,6 @@ public class MavenIT0064MojoConfigViaSettersTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-setter:setter-touch" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/fooValue" );
verifier.verifyFilePresent( "target/barValue.baz" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java
index 0a175ec7a..c6d6334f9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java
@@ -57,7 +57,6 @@ public class MavenIT0071PluginConfigWithDottedPropertyTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/foo2" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java
index d2d12bc24..620669870 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java
@@ -58,7 +58,6 @@ public class MavenIT0072InterpolationWithDottedPropertyTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "1.0-SNAPSHOT", props.getProperty( "project.version" ) );
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 52efc1015..f1d20d29e 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
@@ -59,7 +59,6 @@ public class MavenIT0085TransitiveSystemScopeTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Collection<String> lines = verifier.loadLines( "target/test.txt", "UTF-8" );
assertTrue( lines.toString(), lines.contains( "system.jar" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java
index 85e36dc10..55c33816c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java
@@ -58,7 +58,6 @@ public class MavenIT0086PluginRealmTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
assertNotNull( pclProps.getProperty( "org.apache.maven.plugin.coreit.ClassA" ) );
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 8464276fb..7083199ec 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
@@ -62,7 +62,6 @@ public class MavenIT0087PluginRealmWithProjectLevelDepsTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
assertNotNull( pclProps.getProperty( "org.apache.maven.plugin.coreit.ClassA" ) );
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 7d3dde47d..1da4728b7 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
@@ -56,7 +56,6 @@ public class MavenIT0090EnvVarInterpolationTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate", envVars );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/env.properties" );
assertEquals( "MAVEN_TEST_ENVAR_VALUE", props.getProperty( "stringParam" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java
index 69cce4da7..d417431f0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java
@@ -86,7 +86,6 @@ public class MavenIT0108SnapshotUpdateTest
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifyArtifactContent( "originalArtifact" );
@@ -100,7 +99,6 @@ public class MavenIT0108SnapshotUpdateTest
verifyArtifactContent( "updatedArtifact" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
@Test
@@ -115,7 +113,6 @@ public class MavenIT0108SnapshotUpdateTest
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifyArtifactContent( "originalArtifact" );
@@ -128,7 +125,6 @@ public class MavenIT0108SnapshotUpdateTest
verifyArtifactContent( "updatedArtifact" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
@Test
@@ -149,7 +145,6 @@ public class MavenIT0108SnapshotUpdateTest
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifyArtifactContent( "originalArtifact" );
assertFalse( localMetadata.exists() );
@@ -167,7 +162,6 @@ public class MavenIT0108SnapshotUpdateTest
verifyArtifactContent( "localArtifact" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Calendar cal = Calendar.getInstance();
cal.add( Calendar.YEAR, -1 );
@@ -183,7 +177,6 @@ public class MavenIT0108SnapshotUpdateTest
verifyArtifactContent( "originalArtifact" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
@Test
@@ -199,7 +192,6 @@ public class MavenIT0108SnapshotUpdateTest
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifyArtifactContent( "originalArtifact" );
@@ -212,7 +204,6 @@ public class MavenIT0108SnapshotUpdateTest
verifyArtifactContent( "updatedArtifact" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
private File getMetadataFile( String groupId, String artifactId, String version )
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 b83458142..4975ead73 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
@@ -54,7 +54,6 @@ public class MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/auth.properties" );
assertEquals( "testuser", props.getProperty( "test.username" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java
index 4ba72748b..cf40dd808 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java
@@ -57,7 +57,6 @@ public class MavenIT0130CleanLifecycleTest
verifier.executeGoal( "clean" );
verifier.verifyFilePresent( "target/clean-clean.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java
index f12cf86a2..e793ab528 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java
@@ -58,7 +58,6 @@ public class MavenIT0131SiteLifecycleTest
verifier.verifyFilePresent( "target/site-site.txt" );
verifier.verifyFilePresent( "target/site-deploy.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java
index 428c705fc..c5fd648c6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java
@@ -62,7 +62,6 @@ public class MavenIT0132PomLifecycleTest
verifier.verifyFilePresent( "target/install-install.txt" );
verifier.verifyFilePresent( "target/deploy-deploy.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java
index 7368f7654..e0efd3dac 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java
@@ -64,7 +64,6 @@ public class MavenIT0133JarLifecycleTest
verifier.verifyFilePresent( "target/install-install.txt" );
verifier.verifyFilePresent( "target/deploy-deploy.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java
index aba379df3..e5925fb1f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java
@@ -64,7 +64,6 @@ public class MavenIT0134WarLifecycleTest
verifier.verifyFilePresent( "target/install-install.txt" );
verifier.verifyFilePresent( "target/deploy-deploy.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java
index b84c3ed12..55232a7a4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java
@@ -64,7 +64,6 @@ public class MavenIT0135EjbLifecycleTest
verifier.verifyFilePresent( "target/install-install.txt" );
verifier.verifyFilePresent( "target/deploy-deploy.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java
index 408825cba..e4119c77e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java
@@ -64,7 +64,6 @@ public class MavenIT0136RarLifecycleTest
verifier.verifyFilePresent( "target/install-install.txt" );
verifier.verifyFilePresent( "target/deploy-deploy.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java
index d07ae6df2..f6b7d2512 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java
@@ -61,7 +61,6 @@ public class MavenIT0137EarLifecycleTest
verifier.verifyFilePresent( "target/install-install.txt" );
verifier.verifyFilePresent( "target/deploy-deploy.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java
index f6061ba87..f166a4727 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java
@@ -70,7 +70,6 @@ public class MavenIT0138PluginLifecycleTest
}
verifier.verifyFilePresent( "target/deploy-deploy.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java
index 231263f7f..93d48b74c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java
@@ -57,7 +57,6 @@ public class MavenIT0139InterpolationWithProjectPrefixTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/interpolated.properties" );
String prefix = "project.properties.";
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java
index b9a4e2c7c..2599d451c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java
@@ -59,7 +59,6 @@ public class MavenIT0140InterpolationWithPomPrefixTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/interpolated.properties" );
String prefix = "project.properties.";
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java
index 25fe1a602..53d7a2d85 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
@@ -68,7 +68,6 @@ public class MavenIT0142DirectDependencyScopesTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> compileArtifacts = verifier.loadLines( "target/compile-artifacts.txt", "UTF-8" );
assertTrue( compileArtifacts.toString(), compileArtifacts.contains( "org.apache.maven.its.it0142:system:jar:0.1" ) );
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 9274e8520..a3ae6b376 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
@@ -259,7 +259,6 @@ public class MavenIT0143TransitiveDependencyScopesTest
verifier.setLogFileName( "log-" + scope + ".txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
return verifier;
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java
index e0ea701ad..fcb78357b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java
@@ -58,7 +58,6 @@ public class MavenIT0144LifecycleExecutionOrderTest
verifier.setAutoclean( false );
verifier.executeGoals( Arrays.asList( new String[]{ "post-clean", "deploy", "site-deploy" } ) );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> expected = new ArrayList<>();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
index c6d81ff82..9edf1d7ef 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
@@ -108,7 +108,6 @@ public class MavenIT0146InstallerSnapshotNaming
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/appassembler/repo/dep-0.1-20110726.105319-1.jar" );
}
@@ -127,7 +126,6 @@ public class MavenIT0146InstallerSnapshotNaming
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( testDir.getAbsolutePath() );
@@ -148,7 +146,6 @@ public class MavenIT0146InstallerSnapshotNaming
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/appassembler/repo/dep-0.1-SNAPSHOT.jar" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java
index 7032cadf1..647fc4f33 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java
@@ -55,7 +55,6 @@ public class MavenIT0199CyclicImportScopeTest extends AbstractMavenIntegrationTe
verifier.verifyFilePresent(expectedArtifact);
}
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 322f07b34..c3e10829a 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
@@ -59,7 +59,6 @@ public class MavenITBootstrapTest
verifier.addCliOption( "-Dbootstrap=" + getClass().getResource( "/bootstrap.txt" ).toURI().getPath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 d0666c41c..f1c7f0681 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
@@ -70,7 +70,6 @@ public class MavenITmng0095ReactorFailureBehaviorTest
{
// expected
}
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject1/target/touch.txt" );
@@ -99,7 +98,6 @@ public class MavenITmng0095ReactorFailureBehaviorTest
verifier.addCliOption( "--fail-never" );
verifier.setLogFileName( "log-fn.txt" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject1/target/touch.txt" );
@@ -137,7 +135,6 @@ public class MavenITmng0095ReactorFailureBehaviorTest
{
// expected
}
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject1/target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java
index 50396c5c5..d6ec2783d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java
@@ -64,7 +64,6 @@ public class MavenITmng0187CollectedProjectsTest
verifier.deleteDirectory( "sub-1/sub-2/target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java
index 078a40447..fe8315a43 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java
@@ -56,7 +56,6 @@ public class MavenITmng0249ResolveDepsFromReactorTest
verifier.setAutoclean( false );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> ccp = verifier.loadLines( "test-component-c/target/compile.txt", "UTF-8" );
assertTrue( ccp.toString(), ccp.contains( "test-component-c/classes" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
index 654167ee3..67875c69e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
@@ -59,7 +59,6 @@ public class MavenITmng0282NonReactorExecWhenProjectIndependentTest
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject/target/touch.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 4c098b8e5..613e86a5b 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
@@ -62,7 +62,6 @@ public class MavenITmng0294MergeGlobalAndUserSettingsTest
verifier.addCliOption( "global-settings.xml" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/test.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
index 7b4ad8c63..837b590b6 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
@@ -62,7 +62,6 @@ public class MavenITmng0377PluginLookupFromPrefixTest
verifier.addCliArgument( "-Dtouch.outputFile=target/file.txt" );
verifier.executeGoal( "itprefix:touch" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/file.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
index 534d26f31..59bdd367c 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
@@ -70,7 +70,6 @@ public class MavenITmng0449PluginVersionResolutionTest
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
// Maven 3.x prefers RELEASE over LATEST (see MNG-4206)
if ( matchesVersionRange( "(,3.0-alpha-3)" ) )
@@ -115,7 +114,6 @@ public class MavenITmng0449PluginVersionResolutionTest
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();
- verifier.resetStreams();
// Maven 3.x prefers RELEASE over LATEST (see MNG-4206)
if ( matchesVersionRange( "(,3.0-alpha-3)" ) )
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 cbce7fb3c..be00b8e66 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
@@ -61,7 +61,6 @@ public class MavenITmng0461TolerateMissingDependencyPomTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
assertTrue( classpath.toString(), classpath.contains( "dep-0.1.jar" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
index 5328c88e8..cb8f703d6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
@@ -60,7 +60,6 @@ public class MavenITmng0469ReportConfigTest
verifier.verifyFilePresent( "target/build.txt" );
verifier.verifyFileNotPresent( "target/reporting.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
/**
@@ -90,7 +89,6 @@ public class MavenITmng0469ReportConfigTest
assertNotEquals( "fail.properties", props.getProperty( "project.reporting.plugins.0.configuration.children.infoFile.0.value" ) );
}
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java
index 3423e75f1..49515e113 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java
@@ -60,7 +60,6 @@ public class MavenITmng0471CustomLifecycleTest
"org.apache.maven.its.plugins:maven-it-plugin-fork:fork-goal"} );
verifier.executeGoals( goals );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/forked/touch.txt" );
verifier.verifyFilePresent( "target/forked2/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
index 4a5f0d6f2..067c84dc9 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
@@ -61,7 +61,6 @@ public class MavenITmng0479OverrideCentralRepoTest
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
// Phase 2: Now run the test
File child2 = new File( testDir, "test" );
@@ -74,7 +73,6 @@ public class MavenITmng0479OverrideCentralRepoTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/expression.properties" );
Properties props = verifier.loadProperties( "target/expression.properties" );
@@ -139,7 +137,6 @@ public class MavenITmng0479OverrideCentralRepoTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng0479", "parent", "0.1-SNAPSHOT", "pom" );
@@ -165,7 +162,6 @@ public class MavenITmng0479OverrideCentralRepoTest
{
// expected
}
- verifier.resetStreams();
verifier.verifyArtifactNotPresent( "org.apache.maven.its.mng0479", "parent", "0.1", "pom" );
@@ -185,7 +181,6 @@ public class MavenITmng0479OverrideCentralRepoTest
{
// expected
}
- verifier.resetStreams();
verifier.verifyArtifactNotPresent( "org.apache.maven.its.mng0479", "a", "0.1", "jar" );
verifier.verifyArtifactNotPresent( "org.apache.maven.its.mng0479", "a", "0.1", "pom" );
@@ -206,7 +201,6 @@ public class MavenITmng0479OverrideCentralRepoTest
{
// expected
}
- verifier.resetStreams();
verifier.verifyArtifactNotPresent( "org.apache.maven.its.mng0479", "b", "0.1", "jar" );
verifier.verifyArtifactNotPresent( "org.apache.maven.its.mng0479", "b", "0.1", "pom" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
index 38e9a7a16..9e9dc5ed8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
@@ -58,7 +58,6 @@ public class MavenITmng0496IgnoreUnknownPluginParametersTest
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-log-file:2.1-SNAPSHOT:reset" );
verifier.verifyFilePresent( "target/file.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 79a89ac01..67eb551ee 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
@@ -65,7 +65,6 @@ public class MavenITmng0505VersionRangeTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Collection<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
assertEquals( 4, artifacts.size() );
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 41c6b36eb..673158a7b 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
@@ -61,7 +61,6 @@ public class MavenITmng0507ArtifactRelocationTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.1", "pom" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java
index a59847169..6c7802d6f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java
@@ -56,7 +56,6 @@ public class MavenITmng0522InheritedPluginMgmtConfigTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "process-resources" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/plugin-mngt-config-1.txt" );
verifier.verifyFilePresent( "target/plugin-mngt-config-2.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
index 9d39dda72..446b335b3 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
@@ -141,7 +141,6 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar" );
}
@@ -179,7 +178,6 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
verifier.setEnvironmentVariable( "MAVEN_OPTS", "-Dsettings.security=" + new File( testDir, "settings~security.xml" ).getAbsolutePath() + " -Duser.language=tr" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar" );
}
@@ -205,7 +203,6 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
verifier.setLogFileName( "log-emp.txt" );
verifier.executeGoal( "-e" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> log = verifier.loadLines( verifier.getLogFileName(), null );
assertNotNull( findPassword( log ) );
@@ -218,7 +215,6 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
verifier.setLogFileName( "log-ep.txt" );
verifier.executeGoal( "-e" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
log = verifier.loadLines( verifier.getLogFileName(), null );
assertNotNull( findPassword( log ) );
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 0917560cf..b945ea64f 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
@@ -58,7 +58,6 @@ public class MavenITmng0557UserSettingsCliOptionTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/test.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java
index 3e6bf43b2..8b111faee 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java
@@ -55,18 +55,15 @@ public class MavenITmng0612NewestConflictResolverTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0612/plugin" );
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0612/project" );
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "verify" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 30d2e7aad..a6db0b901 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
@@ -62,7 +62,6 @@ public class MavenITmng0666IgnoreLegacyPomTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
// don't verify error free log
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.it0059", "test", "3.8.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java
index 9988d05d8..9afa937df 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java
@@ -60,7 +60,6 @@ public class MavenITmng0674PluginParameterAliasTest
verifier.setLogFileName( "log-lifecycle.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties" );
assertEquals( "MNG-674-1", props.getProperty( "aliasParam" ) );
@@ -85,7 +84,6 @@ public class MavenITmng0674PluginParameterAliasTest
verifier.setLogFileName( "log-cli.txt" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-configuration:config" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties" );
assertEquals( "MNG-674-1", props.getProperty( "aliasParam" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java
index f3bd2d67b..8860d6f68 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java
@@ -61,7 +61,6 @@ public class MavenITmng0680ParentBasedirTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/basedir.properties" );
assertEquals( subDir, new File( props.getProperty( "project.basedir" ) ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java
index 1154368dd..267c1b27a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java
@@ -59,7 +59,6 @@ public class MavenITmng0761MissingSnapshotDistRepoTest
verifier.deleteArtifacts( "org.apache.maven.its.mng0761" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/repo/org/apache/maven/its/mng0761/test/1.0-SNAPSHOT/test-1.0-*.jar" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
index 6868c309a..b6510535b 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
@@ -133,7 +133,6 @@ public class MavenITmng0768OfflineModeTest
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
verifier.verifyFilePresent( "target/compile.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
requestedUris.clear();
@@ -150,7 +149,6 @@ public class MavenITmng0768OfflineModeTest
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
verifier.verifyFilePresent( "target/compile.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
assertTrue( requestedUris.toString(), requestedUris.isEmpty() );
@@ -176,7 +174,6 @@ public class MavenITmng0768OfflineModeTest
{
// expected, should fail
}
- verifier.resetStreams();
}
System.out.println( "Bound server socket to the port " + port );
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 b1669adde..9f54106c9 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
@@ -57,7 +57,6 @@ public class MavenITmng0773SettingsProfileReactorPollutionTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java
index 2a4e6d56e..edfdf2291 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java
@@ -57,7 +57,6 @@ public class MavenITmng0781PluginConfigVsExecConfigTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "process-resources" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/exec-level.txt" );
verifier.verifyFilePresent( "target/resources-resources.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java
index 6e3a3e07d..2a42d3219 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java
@@ -62,7 +62,6 @@ public class MavenITmng0786ProfileAwareReactorTest
verifier.verifyFilePresent( "sub1/target/expression.properties" );
verifier.verifyFilePresent( "sub2/target/expression.properties" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 f5694170c..45b3939e4 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
@@ -59,7 +59,6 @@ public class MavenITmng0814ExplicitProfileActivationTest
verifier.addCliOption( "test-profile" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/profile.properties" );
assertEquals( "PASSED", props.getProperty( "project.properties.testProp" ) );
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 ecc35bd07..9a8d23a5d 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
@@ -62,7 +62,6 @@ public class MavenITmng0818WarDepsNotTransitiveTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Collection<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
assertEquals( Collections.singletonList( "org.apache.maven.its.it0080:war:war:0.1" ), artifacts );
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 05d9006e3..320ae8802 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
@@ -61,7 +61,6 @@ public class MavenITmng0820ConflictResolutionTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Collection<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
assertEquals( 3, artifacts.size() );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java
index 586296552..7552c3710 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java
@@ -61,7 +61,6 @@ public class MavenITmng0823MojoContextPassingTest
verifier.executeGoals( goals );
verifier.verifyFilePresent( "target/thrown-value" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java
index 2b1a1b72f..7f8e239d2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java
@@ -63,7 +63,6 @@ public class MavenITmng0828PluginConfigValuesInDebugTest
verifier.setMavenDebug( true );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
String log = FileUtils.fileRead( new File( verifier.getBasedir(), verifier.getLogFileName() ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java
index 94eb60d83..b19606733 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
@@ -66,7 +66,6 @@ public class MavenITmng0836PluginParentResolutionTest
{
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
else
{
@@ -79,7 +78,6 @@ public class MavenITmng0836PluginParentResolutionTest
catch ( VerificationException e )
{
// expected
- verifier.resetStreams();
}
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java
index d4295cef9..06148b4eb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java
@@ -59,7 +59,6 @@ public class MavenITmng0848UserPropertyOverridesDefaultValueTest
verifier.addCliArgument( "-Dconfig.aliasDefaultExpressionParam=PASSED" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties configProps = verifier.loadProperties( "target/config.properties" );
assertEquals( "maven-core-it", configProps.getProperty( "defaultParam" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java
index 2d948b7cc..4e55755fb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java
@@ -59,7 +59,6 @@ public class MavenITmng0866EvaluateDefaultValueTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties configProps = verifier.loadProperties( "target/config.properties" );
assertEquals( "maven-core-it", configProps.getProperty( "defaultParam" ) );
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 e24b7f5b7..9c4afb487 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
@@ -62,7 +62,6 @@ public class MavenITmng0870ReactorAwarePluginDiscoveryTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "project/target/touch.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java
index 74ffb8e18..d4a6c667f 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
@@ -64,7 +64,6 @@ public class MavenITmng0947OptionalDependencyTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
assertTrue( compile.toString(), compile.contains( "org.apache.maven.its.mng0947:d:jar:0.1 (optional)" ) );
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 38a5bdd9b..9b0c98036 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
@@ -60,7 +60,6 @@ public class MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties apiProps = verifier.loadProperties( "target/component.properties" );
assertEquals( "true", apiProps.getProperty( "org.apache.maven.plugin.coreit.DefaultComponent" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java
index 8838424ae..6548905b6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java
@@ -58,7 +58,6 @@ public class MavenITmng0985NonExecutedPluginMgmtGoalsTest
verifier.executeGoal( "initialize" );
verifier.verifyFileNotPresent( "target/unexpected.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
index 296007a55..587625f32 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
@@ -57,7 +57,6 @@ public class MavenITmng1021EqualAttachmentBuildNumberTest
verifier.deleteArtifacts( "org.apache.maven.its.mng1021" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1021", "test", "1-SNAPSHOT", "pom" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1021", "test", "1-SNAPSHOT", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java
index af9073130..92db8b7b8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java
@@ -59,7 +59,6 @@ public class MavenITmng1052PluginMgmtConfigTest
verifier.verifyFilePresent( "target/plugin-management.txt" );
verifier.verifyFileNotPresent( "target/resources-resources.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java
index d4f3ac0fd..02477efcc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java
@@ -62,7 +62,6 @@ public class MavenITmng1073AggregatorForksReactorTest
verifier.setLogFileName( "log-lifecycle.txt" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-fork:2.1-SNAPSHOT:fork-lifecycle-aggregator" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/forked/touch.txt" );
verifier.verifyFilePresent( "sub-1/target/forked/touch.txt" );
@@ -88,7 +87,6 @@ public class MavenITmng1073AggregatorForksReactorTest
verifier.setLogFileName( "log-goal.txt" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-fork:2.1-SNAPSHOT:fork-goal-aggregator" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFilePresent( "sub-1/target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java
index 60e308aa4..57430ae2c 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
@@ -64,7 +64,6 @@ public class MavenITmng1088ReactorPluginResolutionTest
// NOTE: It's essential part of the test to invoke a phase before "compile"
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "client/target/touch.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java
index cb166eca6..30d7315f1 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
@@ -81,7 +81,6 @@ public class MavenITmng1142VersionRangeIntersectionTest
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java
index b0fd79a99..9d0b582f7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java
@@ -57,7 +57,6 @@ public class MavenITmng1144MultipleDefaultGoalsTest
verifier.deleteDirectory( "target" );
verifier.executeGoals( Collections.<String> emptyList() );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/clean-clean.txt" );
verifier.verifyFilePresent( "target/resources-resources.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java
index 994e13e15..8cd8a3992 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
@@ -61,7 +61,6 @@ public class MavenITmng1233WarDepWithProvidedScopeTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Collection<String> compileArtifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
assertTrue( compileArtifacts.toString(),
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 ec710cf5c..d93d594dd 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
@@ -66,7 +66,6 @@ public class MavenITmng1323AntrunDependenciesTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties pclProps;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java
index 973c9d293..a197decf6 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
@@ -60,7 +60,6 @@ public class MavenITmng1349ChecksumFormatsTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1349", "md5-a", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng1349", "md5-a", "0.1", "pom" );
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 37dfb4576..3d7f66627 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
@@ -58,7 +58,6 @@ public class MavenITmng1412DependenciesOrderTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> compileArtifacts = verifier.loadLines( "target/compile-artifacts.txt", "UTF-8" );
assertArtifactOrder( compileArtifacts );
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 210a03d96..4ae12201f 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
@@ -57,7 +57,6 @@ public class MavenITmng1415QuotedSystemPropertiesTest
verifier.addCliOption( "-Dtest.property=Test Property" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/cli.properties" );
assertEquals( "Test Property", props.getProperty( "stringParam" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java
index 4b265090a..2d61b9253 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java
@@ -62,7 +62,6 @@ public class MavenITmng1701DuplicatePluginTest
{
// expected with Maven 4+
}
- verifier.resetStreams();
String logLevel;
if ( matchesVersionRange( "(,4.0.0-alpha-1)" ) )
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 8a9a775f4..d055ce521 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
@@ -63,7 +63,6 @@ public class MavenITmng1703PluginMgmtDepInheritanceTest
verifier.deleteArtifacts( "org.apache.maven.its.mng1703" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
assertNotNull( pclProps.getProperty( "org.apache.maven.plugin.coreit.ClassA" ) );
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 16ba7880e..98cfa1d23 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
@@ -67,7 +67,6 @@ public class MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest
verifier.deleteArtifacts( "org.apache.maven.its.mng1751" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
// phase 2: resolve snapshot, if the previous deployment didn't update the metadata, we get the wrong file
verifier = newVerifier( new File( testDir, "test" ).getAbsolutePath() );
@@ -78,7 +77,6 @@ public class MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties checksums = verifier.loadProperties( "target/checksum.properties" );
String sha1 = checksums.getProperty( "dep-0.1-SNAPSHOT.jar", "" ).toLowerCase( java.util.Locale.ENGLISH );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java
index bfd53c86e..71712dfb1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java
@@ -62,10 +62,6 @@ public class MavenITmng1803PomValidationErrorIncludesLineNumberTest
{
// expected
}
- finally
- {
- verifier.resetStreams();
- }
boolean foundError = false;
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 62a817bea..49266342c 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
@@ -63,7 +63,6 @@ public class MavenITmng1895ScopeConflictResolutionTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
assertTrue( compile.toString(), compile.contains( "a-0.1.jar" ) );
@@ -249,7 +248,6 @@ public class MavenITmng1895ScopeConflictResolutionTest
verifier.setLogFileName( "log-" + scopeB + "-vs-" + scopeA + ".txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
return verifier;
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java
index d5111e2be..2f86130ea 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java
@@ -58,7 +58,6 @@ public class MavenITmng1957JdkActivationWithVersionRangeTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/jdk.properties" );
assertEquals( "PASSED", props.getProperty( "project.properties.jdkProperty1" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java
index 5e2f376d8..31ff1ce5a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java
@@ -61,7 +61,6 @@ public class MavenITmng1992SystemPropOverridesPomPropTest
verifier.getSystemProperties().setProperty( "config.stringParam", "PASSED" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties configProps = verifier.loadProperties( "target/config.properties" );
assertEquals( "PASSED", configProps.getProperty( "stringParam" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java
index a0842b080..a946d9b5e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java
@@ -58,7 +58,6 @@ public class MavenITmng1995InterpolateBooleanModelElementsTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/expression.properties" );
assertEquals( "true", props.getProperty( "project.build.resources.0.filtering" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java
index e20a92e8d..0fcda613d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java
@@ -59,7 +59,6 @@ public class MavenITmng2006ChildPathAwareUrlInheritanceTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "http://project.url/child", props.getProperty( "project.url" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java
index 1bb6e214a..be8575954 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java
@@ -57,7 +57,6 @@ public class MavenITmng2045testJarDependenciesBrokenInReactorTest
verifier.deleteArtifacts( "org.apache.maven.its.mng2045" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> compile = verifier.loadLines( "test-user/target/compile.txt", "UTF-8" );
assertTestClasses( compile );
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 5098ea571..afab3b90e 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
@@ -58,7 +58,6 @@ public class MavenITmng2052InterpolateWithSettingsProfilePropertiesTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java
index 739bf1d23..d8a880b40 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java
@@ -57,7 +57,6 @@ public class MavenITmng2054PluginExecutionInheritanceTest
verifier.deleteDirectory( "project/project-level2/project-level3/project-jar/target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> executions =
verifier.loadLines( "project/project-level2/project-level3/project-jar/target/exec.log", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java
index b5175082d..666074aad 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java
@@ -62,7 +62,6 @@ public class MavenITmng2068ReactorRelativeParentsTest
verifier.deleteArtifacts( "org.apache.maven.its.mng2068" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
/**
@@ -82,7 +81,6 @@ public class MavenITmng2068ReactorRelativeParentsTest
verifier.deleteArtifacts( "org.apache.maven.its.mng2068" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
/**
@@ -102,7 +100,6 @@ public class MavenITmng2068ReactorRelativeParentsTest
verifier.deleteArtifacts( "org.apache.maven.its.mng2068" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 4dd7fb11f..b8ed25a88 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
@@ -62,7 +62,6 @@ public class MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng2098", "dep", "0.1", "jar" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java
index 68f7216e3..48338405c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java
@@ -59,7 +59,6 @@ public class MavenITmng2103PluginExecutionInheritanceTest
verifier.deleteDirectory( "child-2/target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> execs = verifier.loadLines( "child-1/target/log.txt", "UTF-8" );
assertEquals( Arrays.asList( new String[] { "inherited" } ), execs );
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 40af8da62..eb8678576 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
@@ -54,7 +54,6 @@ public class MavenITmng2123VersionRangeDependencyTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng2123:fixed:jar:0.1" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java
index 911d9af69..9b78bb63a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java
@@ -55,7 +55,6 @@ public class MavenITmng2124PomInterpolationWithParentValuesTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/parent.properties" );
assertEquals( "parent, child", props.getProperty( "project.description" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java
index 85103ccdf..e94124eca 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java
@@ -54,7 +54,6 @@ public class MavenITmng2130ParentLookupFromReactorCacheTest
verifier.deleteArtifacts( "org.apache.maven.mng2130" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java
index 2be73750c..d901b310e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java
@@ -58,7 +58,6 @@ public class MavenITmng2135PluginBuildInReactorTest
verifier.deleteArtifacts( "org.apache.maven.its.mng2135" );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "project/target/touch.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
index ef288952c..ba67e9848 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
@@ -62,7 +62,6 @@ public class MavenITmng2136ActiveByDefaultProfileTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/expression.properties" );
Properties props = verifier.loadProperties( "target/expression.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java
index a203386a6..db58efa07 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java
@@ -57,7 +57,6 @@ public class MavenITmng2140ReactorAwareDepResolutionWhenForkTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "project/target/test.txt", "UTF-8" );
assertTrue( artifacts.toString(), artifacts.contains( "dependency/pom.xml" ) );
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 dc768f242..d0a3bf5f1 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
@@ -63,7 +63,6 @@ public class MavenITmng2174PluginDepsManagedByParentProfileTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pcl.properties" );
assertEquals( "1", props.getProperty( "mng-2174.properties.count" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
index f8dfa5c6f..b8acabb04 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
@@ -60,7 +60,6 @@ public class MavenITmng2196ParentResolutionTest
{
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
else
{
@@ -73,7 +72,6 @@ public class MavenITmng2196ParentResolutionTest
catch ( VerificationException e )
{
// expected
- verifier.resetStreams();
}
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
index 49a88aaeb..a1a87d8d7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
@@ -44,30 +44,19 @@ public class MavenITmng2199ParentVersionRangeTest
ResourceExtractor.simpleExtractResources( getClass(),
"/mng-2199-parent-version-range/valid-inclusive-upper-bound" );
- try
- {
- verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
- verifier.addCliOption( "-U" );
- verifier.setAutoclean( false );
-
- verifier.executeGoal( "verify" );
- verifier.verifyErrorFreeLog();
-
- // All Maven versions not supporting remote parent version ranges will log a warning message whenever
- // building a parent fails. The build succeeds without any parent. If that warning message appears in the
- // log, parent resolution failed.
- final List<String> lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
- assertFalse( "Unexpected error message found.",
- indexOf( lines, ".*Failed to build parent project.*" ) >= 0 );
-
- }
- finally
- {
- if ( verifier != null )
- {
- verifier.resetStreams();
- }
- }
+ verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
+ verifier.addCliOption( "-U" );
+ verifier.setAutoclean( false );
+
+ verifier.executeGoal( "verify" );
+ verifier.verifyErrorFreeLog();
+
+ // All Maven versions not supporting remote parent version ranges will log a warning message whenever
+ // building a parent fails. The build succeeds without any parent. If that warning message appears in the
+ // log, parent resolution failed.
+ final List<String> lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
+ assertFalse( "Unexpected error message found.",
+ indexOf( lines, ".*Failed to build parent project.*" ) >= 0 );
}
@Test
@@ -79,30 +68,20 @@ public class MavenITmng2199ParentVersionRangeTest
File testDir = ResourceExtractor.simpleExtractResources(
getClass(), "/mng-2199-parent-version-range/valid-exclusive-upper-bound" );
- try
- {
- verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
- verifier.addCliOption( "-U" );
- verifier.setAutoclean( false );
- verifier.executeGoal( "verify" );
- verifier.verifyErrorFreeLog();
+ verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
+ verifier.addCliOption( "-U" );
+ verifier.setAutoclean( false );
- // All Maven versions not supporting remote parent version ranges will log a warning message whenever
- // building a parent fails. The build succeeds without any parent. If that warning message appears in the
- // log, parent resolution failed.
- final List<String> lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
- assertFalse( "Unexpected error message found.",
- indexOf( lines, ".*Failed to build parent project.*" ) >= 0 );
+ verifier.executeGoal( "verify" );
+ verifier.verifyErrorFreeLog();
- }
- finally
- {
- if ( verifier != null )
- {
- verifier.resetStreams();
- }
- }
+ // All Maven versions not supporting remote parent version ranges will log a warning message whenever
+ // building a parent fails. The build succeeds without any parent. If that warning message appears in the
+ // log, parent resolution failed.
+ final List<String> lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
+ assertFalse( "Unexpected error message found.",
+ indexOf( lines, ".*Failed to build parent project.*" ) >= 0 );
}
@Test
@@ -128,13 +107,6 @@ public class MavenITmng2199ParentVersionRangeTest
indexOf( lines, ".*(parent)? version range.*does not specify an upper bound.*" ) >= 0 );
}
- finally
- {
- if ( verifier != null )
- {
- verifier.resetStreams();
- }
- }
}
@Test
@@ -160,13 +132,6 @@ public class MavenITmng2199ParentVersionRangeTest
int msg = indexOf( lines, ".*Version must be a constant.*org.apache.maven.its.mng2199:expression.*" );
assertTrue( "Expected error message not found.", msg >= 0 );
}
- finally
- {
- if ( verifier != null )
- {
- verifier.resetStreams();
- }
- }
}
@Test
@@ -192,13 +157,6 @@ public class MavenITmng2199ParentVersionRangeTest
int msg = indexOf( lines, ".*Version must be a constant.*org.apache.maven.its.mng2199:inherited.*" );
assertTrue( "Expected error message not found.", msg >= 0 );
}
- finally
- {
- if ( verifier != null )
- {
- verifier.resetStreams();
- }
- }
}
@Test
@@ -210,29 +168,19 @@ public class MavenITmng2199ParentVersionRangeTest
File testDir = ResourceExtractor.simpleExtractResources(
getClass(), "/mng-2199-parent-version-range/valid-local/child" );
- try
- {
- verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "verify" );
- verifier.verifyErrorFreeLog();
- // All Maven versions not supporting remote parent version ranges will log a warning message whenever
- // building a parent fails. The build succeeds without any parent. If that warning message appears in the
- // log, parent resolution failed. For this test, this really just tests the project on disk getting tested
- // is not corrupt. It's expected to find the local parent and not fall back to remote resolution. If it
- // falls back to remote resolution, this just catches the test project to be broken.
- final List<String> lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
- assertFalse( "Unexpected error message found.",
- indexOf( lines, ".*Failed to build parent project.*" ) >= 0 );
+ verifier = newVerifier( testDir.getAbsolutePath() );
+ verifier.executeGoal( "verify" );
+ verifier.verifyErrorFreeLog();
- }
- finally
- {
- if ( verifier != null )
- {
- verifier.resetStreams();
- }
- }
+ // All Maven versions not supporting remote parent version ranges will log a warning message whenever
+ // building a parent fails. The build succeeds without any parent. If that warning message appears in the
+ // log, parent resolution failed. For this test, this really just tests the project on disk getting tested
+ // is not corrupt. It's expected to find the local parent and not fall back to remote resolution. If it
+ // falls back to remote resolution, this just catches the test project to be broken.
+ final List<String> lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
+ assertFalse( "Unexpected error message found.",
+ indexOf( lines, ".*Failed to build parent project.*" ) >= 0 );
}
@Test
@@ -259,13 +207,6 @@ public class MavenITmng2199ParentVersionRangeTest
".*Non-resolvable parent POM org.apache.maven.its.mng2199:local-parent:\\[2,3\\].*" );
assertTrue( "Expected error message not found.", msg >= 0 );
}
- finally
- {
- if ( verifier != null )
- {
- verifier.resetStreams();
- }
- }
}
@Test
@@ -277,29 +218,18 @@ public class MavenITmng2199ParentVersionRangeTest
File testDir = ResourceExtractor.simpleExtractResources(
getClass(), "/mng-2199-parent-version-range/local-fallback-to-remote/child" );
- try
- {
- verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
- verifier.executeGoal( "verify" );
- verifier.verifyErrorFreeLog();
-
- // All Maven versions not supporting remote parent version ranges will log a warning message whenever
- // building a parent fails. The build succeeds without any parent. If that warning message appears in the
- // log, parent resolution failed. For this test, local parent resolution falls back to remote parent
- // resolution with a version range in use. If the warning message is in the logs, that remote parent
- // resolution failed unexpectedly.
- final List<String> lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
- assertFalse( "Unexpected error message found.",
- indexOf( lines, ".*Failed to build parent project.*" ) >= 0 );
-
- }
- finally
- {
- if ( verifier != null )
- {
- verifier.resetStreams();
- }
- }
+ verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
+ verifier.executeGoal( "verify" );
+ verifier.verifyErrorFreeLog();
+
+ // All Maven versions not supporting remote parent version ranges will log a warning message whenever
+ // building a parent fails. The build succeeds without any parent. If that warning message appears in the
+ // log, parent resolution failed. For this test, local parent resolution falls back to remote parent
+ // resolution with a version range in use. If the warning message is in the logs, that remote parent
+ // resolution failed unexpectedly.
+ final List<String> lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
+ assertFalse( "Unexpected error message found.",
+ indexOf( lines, ".*Failed to build parent project.*" ) >= 0 );
}
@Test
@@ -324,13 +254,6 @@ public class MavenITmng2199ParentVersionRangeTest
int msg = indexOf( lines, ".*Version must be a constant.*org.apache.maven.its.mng2199:expression.*" );
assertTrue( "Expected error message not found.", msg >= 0 );
}
- finally
- {
- if ( verifier != null )
- {
- verifier.resetStreams();
- }
- }
}
@Test
@@ -355,13 +278,6 @@ public class MavenITmng2199ParentVersionRangeTest
int msg = indexOf( lines, ".*Version must be a constant.*org.apache.maven.its.mng2199:inherited.*" );
assertTrue( "Expected error message not found.", msg >= 0 );
}
- finally
- {
- if ( verifier != null )
- {
- verifier.resetStreams();
- }
- }
}
private static int indexOf( final List<String> logLines, final String regex )
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
index b1ef2759b..2d459f936 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
@@ -56,7 +56,6 @@ public class MavenITmng2201PluginConfigInterpolationTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties" );
assertCanonicalFileEquals( new File( testDir, "target" ), new File( props.getProperty( "stringParam" ) ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java
index 31ec2978a..faa50f265 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java
@@ -61,7 +61,6 @@ public class MavenITmng2222OutputDirectoryReactorResolutionTest
verifier.deleteArtifacts( "org.apache.maven.its.mng2222" );
verifier.executeGoal( "compile" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> classpath = verifier.loadLines( "mod-b/target/compile.txt", "UTF-8" );
assertTrue( classpath.toString(), classpath.contains( "mod-a/target/classes" ) );
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 331910076..2c5d7b060 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
@@ -62,7 +62,6 @@ public class MavenITmng2228ComponentInjectionTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties apiProps = verifier.loadProperties( "target/api.properties" );
assertEquals( "true", apiProps.getProperty( "org.apache.maven.its.mng2228.DefaultComponent" ) );
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 9084bd4f6..f60b3fbf2 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
@@ -58,7 +58,6 @@ public class MavenITmng2234ActiveProfilesFromSettingsTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java
index 82561434f..95bfc15b5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java
@@ -60,7 +60,6 @@ public class MavenITmng2254PomEncodingTest
verifier.deleteDirectory( "latin-1/target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties utf8 = verifier.loadProperties( "utf-8/target/pom.properties" );
assertEquals( "TEST-CHARS: \u00DF\u0131\u03A3\u042F\u05D0\u20AC", utf8.getProperty( "project.description" ) );
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 6f04cff5e..a96d3985f 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
@@ -60,7 +60,6 @@ public class MavenITmng2276ProfileActivationBySettingsPropertyTest
verifier.setLogFileName( "log-1.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/profile.properties" );
assertEquals( "settings", props.getProperty( "project.properties.settingsProperty" ) );
@@ -87,7 +86,6 @@ public class MavenITmng2276ProfileActivationBySettingsPropertyTest
verifier.setLogFileName( "log-2.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/profile.properties" );
assertEquals( "settings", props.getProperty( "project.properties.settingsProperty" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java
index b71130a3d..ace590646 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java
@@ -57,7 +57,6 @@ public class MavenITmng2293CustomPluginParamImplTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/param.properties" );
assertEquals( "org.apache.maven.plugin.coreit.sub.AnImplementation-foobar", props.getProperty( "theParameter.string" ) );
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 49101577a..22f563360 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
@@ -116,7 +116,6 @@ public class MavenITmng2305MultipleProxiesTest
verifier.addCliArgument( "-Dmaven.artifact.threads=1" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
finally
{
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java
index 80547df0f..bf45fd1ea 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
@@ -72,7 +72,6 @@ public class MavenITmng2309ProfileInjectionOrderTest
}
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "e", props.getProperty( "project.properties.pomProperty" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java
index 7b690b73d..e8f9a4ac7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java
@@ -55,7 +55,6 @@ public class MavenITmng2318LocalParentResolutionTest
verifier.setAutoclean( false );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 52e16099c..00c8ae8fb 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
@@ -52,7 +52,6 @@ public class MavenITmng2339BadProjectInterpolationTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
// test that -Dversion=1.0 is still available for interpolation.
@@ -76,7 +75,6 @@ public class MavenITmng2339BadProjectInterpolationTest
new File( testDir, "target/touch-1.txt" ).exists() );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
@@ -87,7 +85,6 @@ public class MavenITmng2339BadProjectInterpolationTest
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
assertTrue( "Touchfile using CLI-specified ${version} does not exist.",
new File( testDir, "target/touch-2.txt" ).exists() );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java
index 6e5fda404..d5c857f6e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java
@@ -60,7 +60,6 @@ public class MavenITmng2362DeployedPomEncodingTest
verifier.deleteArtifacts( "org.apache.maven.its.mng2362" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
File pomFile;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java
index 855603123..482a07e99 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java
@@ -59,7 +59,6 @@ public class MavenITmng2363BasedirAwareFileActivatorTest
verifier.deleteDirectory( "sub-b/target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/parent1.txt" );
verifier.verifyFilePresent( "target/parent2.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
index 0a5c1e13f..3513d212e 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
@@ -138,7 +138,6 @@ public class MavenITmng2387InactiveProxyTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng2387", "a", "0.1", "jar" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java
index 4a4e402bd..ad3e1de7f 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
@@ -63,7 +63,6 @@ public class MavenITmng2432PluginPrefixOrderTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "it:touch" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFileNotPresent( "target/touch-settings.txt" );
verifier.verifyFilePresent( "target/touch-pom.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java
index 1ddb9523e..0b05362b6 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
@@ -62,21 +62,18 @@ public class MavenITmng2486TimestampedDependencyVersionInterpolationTest
verifier.deleteArtifacts( "org.apache.maven.its.mng2486" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( new File( testDir, "parent" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( new File( testDir, "dep-b" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( new File( testDir, "test" ).getAbsolutePath() );
verifier.setAutoclean( false );
@@ -88,7 +85,6 @@ public class MavenITmng2486TimestampedDependencyVersionInterpolationTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> files = verifier.loadLines( "target/classpath.txt", "UTF-8" );
assertTrue( files.toString(), files.contains( "dep-a-0.1-SNAPSHOT.jar" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java
index 30c6e384d..bfa272479 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java
@@ -52,7 +52,6 @@ public class MavenITmng2562Timestamp322Test
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Date now = new Date();
@@ -78,7 +77,6 @@ public class MavenITmng2562Timestamp322Test
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Date now = new Date();
@@ -103,7 +101,6 @@ public class MavenITmng2562Timestamp322Test
verifier.deleteDirectory( "child-3/target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
String timestamp = props.getProperty( "project.properties.timestamp", "" );
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 c466e6f92..252ff0c7e 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
@@ -69,7 +69,6 @@ public class MavenITmng2576MakeLikeReactorTest
verifier.setLogFileName( "log-only.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "sub-a/target/touch.txt" );
@@ -98,7 +97,6 @@ public class MavenITmng2576MakeLikeReactorTest
verifier.setLogFileName( "log-upstream.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFilePresent( "sub-a/target/touch.txt" );
@@ -127,7 +125,6 @@ public class MavenITmng2576MakeLikeReactorTest
verifier.setLogFileName( "log-downstream.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "sub-a/target/touch.txt" );
@@ -157,7 +154,6 @@ public class MavenITmng2576MakeLikeReactorTest
verifier.setLogFileName( "log-both.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFilePresent( "sub-a/target/touch.txt" );
@@ -186,7 +182,6 @@ public class MavenITmng2576MakeLikeReactorTest
verifier.setLogFileName( "log-basedir.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "sub-a/target/touch.txt" );
@@ -218,7 +213,6 @@ public class MavenITmng2576MakeLikeReactorTest
verifier.setLogFileName( "log-basedir-plus.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "sub-a/target/touch.txt" );
@@ -245,7 +239,6 @@ public class MavenITmng2576MakeLikeReactorTest
verifier.setLogFileName( "log-id.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "sub-a/target/touch.txt" );
@@ -276,7 +269,6 @@ public class MavenITmng2576MakeLikeReactorTest
verifier.setLogFileName( "log-artifact-id.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "sub-a/target/touch.txt" );
@@ -304,7 +296,6 @@ public class MavenITmng2576MakeLikeReactorTest
verifier.setLogFileName( "log-resume.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "sub-a/target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java
index fa8c397df..007e259be 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
@@ -61,7 +61,6 @@ public class MavenITmng2577SettingsXmlInterpolationTest
verifier.setLogFileName( "log-env.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/settings.properties" );
assertEquals( "env-var-test", props.getProperty( "settings.servers.0.username" ) );
@@ -89,7 +88,6 @@ public class MavenITmng2577SettingsXmlInterpolationTest
verifier.setLogFileName( "log-sys.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/settings.properties" );
assertEquals( "usr-prop-test", props.getProperty( "settings.servers.0.username" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
index acb3b4e59..d6f9ece77 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
@@ -77,7 +77,6 @@ public class MavenITmng2591MergeInheritedPluginConfigTest
verifier.deleteDirectory( "subproject/target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "subproject/target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java
index fd292515a..03d729836 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
@@ -61,7 +61,6 @@ public class MavenITmng2605BogusProfileActivationTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/profile.properties" );
assertNull( props.getProperty( "project.properties.pomProperty" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java
index 12f91b045..60b447ecb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java
@@ -51,7 +51,6 @@ public class MavenITmng2668UsePluginDependenciesForSortingTest
verifier.deleteArtifacts( "org.apache.maven.its.mng2668" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng2668", "project", "1.0-SNAPSHOT", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng2668", "tools", "1.0-SNAPSHOT", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java
index b82a3ceb8..064cdb89c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java
@@ -67,10 +67,6 @@ public class MavenITmng2690MojoLoadingErrorsTest
{
// expected...it'd be nice if we could get the specifics of the exception right here...
}
- finally
- {
- verifier.resetStreams();
- }
List<String> lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
@@ -100,10 +96,6 @@ public class MavenITmng2690MojoLoadingErrorsTest
{
// expected...it'd be nice if we could get the specifics of the exception right here...
}
- finally
- {
- verifier.resetStreams();
- }
List<String> lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
@@ -133,10 +125,6 @@ public class MavenITmng2690MojoLoadingErrorsTest
{
// expected...it'd be nice if we could get the specifics of the exception right here...
}
- finally
- {
- verifier.resetStreams();
- }
List<String> lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
@@ -166,10 +154,6 @@ public class MavenITmng2690MojoLoadingErrorsTest
{
// expected...it'd be nice if we could get the specifics of the exception right here...
}
- finally
- {
- verifier.resetStreams();
- }
List<String> lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java
index 2a0dc99b8..bd1feff82 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java
@@ -56,7 +56,6 @@ public class MavenITmng2693SitePluginRealmTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "pre-site" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
assertNotNull( pclProps.getProperty( "org.apache.maven.plugin.coreit.ClassA" ) );
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 1baef6727..378b9d2af 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
@@ -68,7 +68,6 @@ public class MavenITmng2695OfflinePluginSnapshotsTest
verifier.verifyFilePresent( "target/a.txt" );
verifier.verifyFilePresent( "target/b.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
{
@@ -84,7 +83,6 @@ public class MavenITmng2695OfflinePluginSnapshotsTest
verifier.verifyFilePresent( "target/a.txt" );
verifier.verifyFilePresent( "target/b.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java
index a06c2e45d..2033af432 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java
@@ -61,7 +61,6 @@ public class MavenITmng2720SiblingClasspathArtifactsTest
verifier.deleteDirectory( "child3/target" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> classPath;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java
index 4ae70fbbd..270b1a334 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
@@ -58,7 +58,6 @@ public class MavenITmng2738ProfileIdCollidesWithCliOptionTest
verifier.addCliOption( "-Pe" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java
index f2e388bbf..91463620a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java
@@ -66,7 +66,6 @@ public class MavenITmng2739RequiredRepositoryElementsTest
// expected
}
- verifier.resetStreams();
List<String> listing = verifier.loadFile( new File( testDir, "log.txt" ), false );
boolean foundNpe = false;
@@ -107,7 +106,6 @@ public class MavenITmng2739RequiredRepositoryElementsTest
// expected
}
- verifier.resetStreams();
List<String> listing = verifier.loadFile( new File( testDir, "log.txt" ), false );
boolean foundNpe = false;
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 8faafc6b1..2c0b03808 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
@@ -107,10 +107,6 @@ public class MavenITmng2741PluginMetadataResolutionErrorMessageTest
}
assertTrue( "Transfer error cause was not found: " + sb, foundCause );
}
- finally
- {
- verifier.resetStreams();
- }
}
}
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 85662dc95..bf32f522f 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
@@ -60,7 +60,6 @@ public class MavenITmng2744checksumVerificationTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng2744", "a", "1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng2744", "a", "1", "pom" );
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 70fb84206..e3fe02eaa 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
@@ -61,7 +61,6 @@ public class MavenITmng2749ExtensionAvailableToPluginTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
assertNotNull( pclProps.getProperty( "org.apache.maven.its.mng2749.ExtensionClass" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java
index 0f98641cb..325b0b5a9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java
@@ -55,18 +55,15 @@ public class MavenITmng2771PomExtensionComponentOverrideTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2771/plugin" );
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2771/project" );
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "verify" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java
index 236503468..989271921 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java
@@ -66,7 +66,6 @@ public class MavenITmng2790LastUpdatedMetadataTest
verifier.setAutoclean( false );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
File metadataArtifactVersionFile =
new File( verifier.getArtifactMetadataPath( "org.apache.maven.its.mng2790", "project", "1.0-SNAPSHOT" ) );
@@ -92,7 +91,6 @@ public class MavenITmng2790LastUpdatedMetadataTest
verifier.setAutoclean( false );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Date artifactVersionLastUpdated2 = getLastUpdated( metadataArtifactVersionFile );
Date artifactLastUpdated2 = getLastUpdated( metadataArtifactFile );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java
index 2f40d9ed8..da391ec30 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java
@@ -58,7 +58,6 @@ public class MavenITmng2820PomCommentsTest
verifier.deleteArtifacts( "org.apache.maven.its.mng2820" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
File installed = new File( verifier.getArtifactPath( "org.apache.maven.its.mng2820", "test", "0.1", "pom" ) );
assertPomComments( installed );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java
index 9a853ed7a..e7ef51650 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java
@@ -56,7 +56,6 @@ public class MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/test-1.0-it.jar" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java
index c978c35a9..601342f47 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java
@@ -58,7 +58,6 @@ public class MavenITmng2843PluginConfigPropertiesInjectionTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/project.properties" );
assertEquals( "PASSED", props.getProperty( "key" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java
index fad915c45..1af4b8b85 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java
@@ -58,7 +58,6 @@ public class MavenITmng2848ProfileActivationByEnvironmentVariableTest
verifier.setEnvironmentVariable( "MNG2848", "GO" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/profile.properties" );
assertEquals( "PASSED", props.getProperty( "project.properties.testProp" ) );
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 6650086c6..2ef896f93 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
@@ -104,7 +104,6 @@ public class MavenITmng2865MirrorWildcardTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng2865", "a", "0.1", "jar" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java
index 51170c5ae..c8d7fef8d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java
@@ -58,7 +58,6 @@ public class MavenITmng2871PrePackageSubartifactResolutionTest
verifier.deleteDirectory( "consumer/target" );
verifier.executeGoal( "compile" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> compileClassPath = verifier.loadLines( "consumer/target/compile.txt", "UTF-8" );
assertEquals( 2, compileClassPath.size() );
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 93d20e86e..b546391b0 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
@@ -63,7 +63,6 @@ public class MavenITmng2892HideCorePlexusUtilsTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
assertEquals( "methodStub", pclProps.getProperty( "org.codehaus.plexus.util.StringUtils.methods" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java
index 182dabd6c..c4ab48e66 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java
@@ -64,7 +64,6 @@ public class MavenITmng2921ActiveAttachedArtifactsTest
verifier.deleteDirectory( "consumer/target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Collection<String> compileArtifacts = verifier.loadLines( "consumer/target/compile.txt", "UTF-8" );
assertTrue( compileArtifacts.toString(),
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 b99f11b1a..6be0f7788 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
@@ -65,7 +65,6 @@ public class MavenITmng2926PluginPrefixOrderTest
verifier.deleteArtifacts( "org.codehaus.mojo", "mng-2926", "0.1" );
new File( verifier.getArtifactMetadataPath( "org.codehaus.mojo", null, null, "maven-metadata-maven-core-it.xml" ) ).delete();
new File( verifier.getArtifactMetadataPath( "org.codehaus.mojo", null, null, "resolver-status.properties" ) ).delete();
- verifier.resetStreams();
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
@@ -76,7 +75,6 @@ public class MavenITmng2926PluginPrefixOrderTest
verifier.addCliOption( "settings-default.xml" );
verifier.executeGoal( "mng-2926:apache" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
@@ -87,7 +85,6 @@ public class MavenITmng2926PluginPrefixOrderTest
verifier.addCliOption( "settings-custom.xml" );
verifier.executeGoal( "mng-2926:custom" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 d11d3cc3e..68c673159 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
@@ -61,7 +61,6 @@ public class MavenITmng2972OverridePluginDependencyTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
verify( pclProps );
@@ -93,7 +92,6 @@ public class MavenITmng2972OverridePluginDependencyTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-class-loader:2.1-SNAPSHOT:load" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
verify( pclProps );
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 3ca34ae33..ec101cde0 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
@@ -58,7 +58,6 @@ public class MavenITmng2994SnapshotRangeRepositoryTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 fea6cdfff..31980ab54 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
@@ -72,7 +72,6 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
{
// expected
}
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject1/target/touch.txt" );
@@ -102,7 +101,6 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
verifier.setLogFileName( "log-fn-mt1.txt" );
verifier.addCliArgument( "-Dmaven.threads.experimental=1" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject1/target/touch.txt" );
@@ -141,7 +139,6 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
{
// expected
}
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject1/target/touch.txt" );
@@ -171,7 +168,6 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
verifier.setLogFileName( "log-fn-mt2.txt" );
verifier.addCliArgument( "-Dmaven.threads.experimental=2" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject1/target/touch.txt" );
@@ -210,7 +206,6 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
{
// expected
}
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "subproject1/target/touch.txt" );
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 f82f2b8de..eee07e074 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
@@ -62,7 +62,6 @@ public class MavenITmng3012CoreClassImportTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties xpp3domProps = verifier.loadProperties( "target/xpp3dom.properties" );
assertEquals( "true", xpp3domProps.getProperty( "project.reporting.plugins.0.configuration" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java
index 45d36b256..851f68750 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java
@@ -76,10 +76,6 @@ public class MavenITmng3023ReactorDependencyResolutionTest
{
// expected.
}
- finally
- {
- verifier.resetStreams();
- }
}
/**
@@ -108,7 +104,6 @@ public class MavenITmng3023ReactorDependencyResolutionTest
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> compileClassPath = verifier.loadLines( "consumer/target/compile.classpath", "UTF-8" );
assertTrue( compileClassPath.toString(), compileClassPath.contains( "dependency-classes" ) );
@@ -144,7 +139,6 @@ public class MavenITmng3023ReactorDependencyResolutionTest
verifier.setLogFileName( "log-c-1.txt" );
verifier.executeGoal( "generate-sources" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> compileClassPath = verifier.loadLines( "consumer/target/compile.classpath", "UTF-8" );
assertTrue( compileClassPath.toString(), compileClassPath.contains( "dependency-1.jar" ) );
@@ -155,7 +149,6 @@ public class MavenITmng3023ReactorDependencyResolutionTest
verifier.setLogFileName( "log-c-2.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
compileClassPath = verifier.loadLines( "consumer/target/compile.classpath", "UTF-8" );
assertTrue( compileClassPath.toString(), compileClassPath.contains( "dependency-1.jar" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java
index 1485cebba..574bd48b7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java
@@ -64,7 +64,6 @@ public class MavenITmng3038TransitiveDepManVersionTest
verifier.deleteArtifact( "org.apache.maven.its.it0121", "D", "1.0", "jar" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
private void compileDDep( File testDirBase, String projectDDepDir, String version )
@@ -76,6 +75,5 @@ public class MavenITmng3038TransitiveDepManVersionTest
verifierOtherDep.deleteArtifact( "org.apache.maven.its.it0121", "D", version, "pom" );
verifierOtherDep.executeGoal( "install" );
verifierOtherDep.verifyErrorFreeLog();
- verifierOtherDep.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java
index 5c8f7b1e3..90bbe8d49 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java
@@ -63,7 +63,6 @@ public class MavenITmng3043BestEffortReactorResolutionTest
verifier.setLogFileName( "log-test.txt" );
verifier.executeGoal( "test" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> classpath;
@@ -120,7 +119,6 @@ public class MavenITmng3043BestEffortReactorResolutionTest
verifier.setLogFileName( "log-package.txt" );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> classpath;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
index 39444172d..b81cd4671 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
@@ -68,7 +68,6 @@ public class MavenITmng3052DepRepoAggregationTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3052", "direct", "0.1-SNAPSHOT", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3052", "trans", "0.1-SNAPSHOT", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java
index c4d2bf9a8..628b33b7a 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
@@ -64,7 +64,6 @@ public class MavenITmng3092SnapshotsExcludedFromVersionRangeTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
assertTrue( classpath.toString(), classpath.contains( "a-1.1.jar" ) );
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 4b932cc5a..cc66c0cd8 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
@@ -62,7 +62,6 @@ public class MavenITmng3099SettingsProfilesWithNoPomTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "org.apache.maven.its.mng3099:maven-mng3099-plugin:0.1:touch" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/PASSED.txt" );
verifier.verifyFileNotPresent( "target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java
index 4058759dc..782fad1ad 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java
@@ -58,7 +58,6 @@ public class MavenITmng3118TestClassPathOrderTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> testClassPath = verifier.loadLines( "target/test-classpath.txt", "UTF-8" );
assertEquals( Arrays.asList( new String[] { "test-classes", "classes" } ), testClassPath );
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 162522e80..e4e39b8ca 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
@@ -61,7 +61,6 @@ public class MavenITmng3122ActiveProfilesNoDuplicatesTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/profile.properties" );
int count = 0;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java
index 041cba337..dc1d37228 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java
@@ -58,7 +58,6 @@ public class MavenITmng3133UrlNormalizationNotBeforeInterpolationTest
verifier.setAutoclean( false );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/url.properties" );
String url;
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 9349b7f6f..8d9289a9c 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
@@ -65,7 +65,6 @@ public class MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
// phase 2: trigger blacklisting of repo (by invalid URL) and check previously downloaded metadata is still used
@@ -79,7 +78,6 @@ public class MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 b5ed93120..3cfaf705a 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
@@ -63,7 +63,6 @@ public class MavenITmng3183LoggingToFileTest
new File( testDir, "maven.log" ).delete();
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> stdout = verifier.loadLines( "stdout.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java
index 2fd76da53..1b48bbd45 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java
@@ -56,6 +56,5 @@ public class MavenITmng3203DefaultLifecycleExecIdTest
verifier.executeGoal( "compile" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 073b4f44d..b1ed3866d 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
@@ -59,7 +59,6 @@ public class MavenITmng3208ProfileAwareReactorSortingTest
verifier.addCliOption( "-Pmng3208" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> order = verifier.loadLines( "target/order.txt", "UTF-8" );
assertEquals( Arrays.asList( new String[] { "mod-b", "mod-a" } ), order );
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 c0b5ea6cd..9159f142a 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
@@ -63,7 +63,6 @@ public class MavenITmng3217InterPluginDependencyTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "sub-1/target/touch-1.txt" );
verifier.verifyFilePresent( "sub-2/target/touch-2.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
index db8dc5232..c19a0b376 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
@@ -59,7 +59,6 @@ public class MavenITmng3220ImportScopeTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
@Test
@@ -90,7 +89,6 @@ public class MavenITmng3220ImportScopeTest
// expected
}
- verifier.resetStreams();
List<String> lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java
index f2ef938fa..424ae4227 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java
@@ -58,13 +58,11 @@ public class MavenITmng3259DepsDroppedInMultiModuleBuildTest
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
index 9caafd1ca..178140561 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
@@ -61,7 +61,6 @@ public class MavenITmng3268MultipleHyphenPCommandLineTest
verifier.verifyFilePresent( "target/profile2/touch.txt" );
verifier.verifyFilePresent( "target/profile3/touch.txt" );
verifier.verifyFilePresent( "target/profile4/touch.txt" );
- verifier.resetStreams();
}
}
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 009fe2d63..858694b7a 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
@@ -65,7 +65,6 @@ public class MavenITmng3284UsingCachedPluginsTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
/*
* Phase 2: Now that the plugin versions have been downloaded to the local repo, run the actual test.
@@ -78,7 +77,6 @@ public class MavenITmng3284UsingCachedPluginsTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "mod-a/target/version-0.1.txt" );
verifier.verifyFileNotPresent( "mod-a/target/version-0.2.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java
index ee29d6f2f..f38d2d62f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java
@@ -62,7 +62,6 @@ public class MavenITmng3288SystemScopeDirTest
{
// expected, <systemPath> of a system-scoped dependency should be a file, not a directory
}
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java
index 9f1e01863..a3c8cf92d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java
@@ -59,7 +59,6 @@ public class MavenITmng3297DependenciesNotLeakedToMojoTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
assertEquals( artifacts.toString(), 1, artifacts.size() );
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 d6e8c8896..23b8691ae 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
@@ -65,7 +65,6 @@ public class MavenITmng3314OfflineSnapshotsTest
verifier.executeGoal( "validate" );
verifier.verifyFilePresent( "target/compile.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
{
@@ -78,7 +77,6 @@ public class MavenITmng3314OfflineSnapshotsTest
verifier.executeGoal( "validate" );
verifier.verifyFilePresent( "target/compile.txt" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java
index 8f7aa0bbc..dbf34da3f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java
@@ -63,12 +63,6 @@ public class MavenITmng3331ModulePathNormalizationTest
* http://maven.apache.org/shared/maven-verifier/apidocs/index.html
*/
verifier.verifyErrorFreeLog();
-
- /*
- * Reset the streams before executing the verifier
- * again.
- */
- verifier.resetStreams();
}
@Test
@@ -94,12 +88,6 @@ public class MavenITmng3331ModulePathNormalizationTest
* http://maven.apache.org/shared/maven-verifier/apidocs/index.html
*/
verifier.verifyErrorFreeLog();
-
- /*
- * Reset the streams before executing the verifier
- * again.
- */
- verifier.resetStreams();
}
}
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 fbde79fb0..3ba6ae2cf 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
@@ -53,7 +53,6 @@ public class MavenITmng3355TranslatedPathInterpolationTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 2a8a69a7c..522792385 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
@@ -68,8 +68,6 @@ public class MavenITmng3372DirectInvocationOfPluginsTest
verifier.executeGoal( "mng3372:test" );
verifier.verifyErrorFreeLog();
-
- verifier.resetStreams();
}
@Test
@@ -87,7 +85,5 @@ public class MavenITmng3372DirectInvocationOfPluginsTest
verifier.executeGoal( "dependency:tree" );
verifier.verifyErrorFreeLog();
-
- verifier.resetStreams();
}
}
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 0f8678bf5..4ace11cea 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
@@ -65,7 +65,6 @@ public class MavenITmng3379ParallelArtifactDownloadsTest
verifier.addCliArgument( "-Dmaven.artifact.threads=16" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
String gid = "org.apache.maven.its.mng3379.";
assertArtifact( verifier, gid + "a", "x", "0.2-SNAPSHOT", "", "jar",
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 a9dad147f..2e238a7b6 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
@@ -68,7 +68,6 @@ public class MavenITmng3380ManagedRelocatedTransdepsTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
assertEquals( 4, artifacts.size() );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java
index 614c207c6..fc5fb5008 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java
@@ -57,7 +57,6 @@ public class MavenITmng3394POMPluginVersionDominanceTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "process-resources" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/resources-resources.txt" );
}
@@ -75,7 +74,6 @@ public class MavenITmng3394POMPluginVersionDominanceTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "clean" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/clean-clean.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java
index 301b63d8e..0b4b18529 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java
@@ -55,7 +55,6 @@ public class MavenITmng3396DependencyManagementForOverConstrainedRangesTest
verifier.deleteArtifact( GROUP_ID, "B", "1.0", "jar" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
testDir = ResourceExtractor.simpleExtractResources( getClass(), baseDir + "/plugin" );
@@ -68,7 +67,6 @@ public class MavenITmng3396DependencyManagementForOverConstrainedRangesTest
verifier.deleteArtifact( GROUP_ID, "plugin", "1.0", "jar" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
testDir = ResourceExtractor.simpleExtractResources( getClass(), baseDir + "/pluginuser" );
@@ -77,6 +75,5 @@ public class MavenITmng3396DependencyManagementForOverConstrainedRangesTest
verifier.deleteArtifact( GROUP_ID, "pluginuser", "1.0", "jar" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java
index a20568b4c..3317a4987 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java
@@ -78,7 +78,6 @@ public class MavenITmng3401CLIDefaultExecIdTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-configuration:2.1-SNAPSHOT:config" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
index c1fd01bfa..61ae1803a 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
@@ -118,7 +118,6 @@ public class MavenITmng3415JunkRepositoryMetadataTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
assertMetadataMissing( verifier );
}
@@ -228,7 +227,6 @@ public class MavenITmng3415JunkRepositoryMetadataTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
assertFalse( requestUris.toString(), requestUris.contains(
"/org/apache/maven/its/mng3415/missing/1.0-SNAPSHOT/maven-metadata.xml" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java
index e80277944..258f38f22 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java
@@ -58,7 +58,6 @@ public class MavenITmng3422ActiveComponentCollectionTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/layout.properties" );
assertNotEquals( "0", props.getProperty( "layouts", "0" ) );
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 8dde60dc4..33992e0a5 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
@@ -75,7 +75,6 @@ public class MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest
assertEquals( "other-plugin", plugins[0].getChild( "prefix" ).getValue() );
assertEquals( "test-artifact", plugins[1].getChild( "prefix" ).getValue() );
- verifier.resetStreams();
}
private Xpp3Dom readDom( File file )
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 f10b72efe..0ed77dd83 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
@@ -72,7 +72,6 @@ public class MavenITmng3461MirrorMatchingTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3461", "a", "0.1", "jar" );
}
@@ -147,7 +146,6 @@ public class MavenITmng3461MirrorMatchingTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
finally
{
@@ -181,7 +179,6 @@ public class MavenITmng3461MirrorMatchingTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3461", "a", "0.1", "jar" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java
index 589de15b7..946533afa 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java
@@ -59,36 +59,30 @@ public class MavenITmng3470StrictChecksumVerificationOfDependencyPomTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
+
try
{
- try
- {
- verifier.setLogFileName( "log-1.txt" );
- verifier.executeGoal( "validate" );
- verifier.verifyErrorFreeLog();
- fail( "Build did not fail despite broken checksum of dependency POM." );
- }
- catch ( VerificationException e )
- {
- // expected
- }
+ verifier.setLogFileName( "log-1.txt" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ fail( "Build did not fail despite broken checksum of dependency POM." );
+ }
+ catch ( VerificationException e )
+ {
+ // expected
+ }
- // NOTE: This second try is to make sure the state caching in the local repo properly replays the error
- try
- {
- verifier.setLogFileName( "log-2.txt" );
- verifier.executeGoal( "validate" );
- verifier.verifyErrorFreeLog();
- fail( "Build did not fail despite broken checksum of dependency POM." );
- }
- catch ( VerificationException e )
- {
- // expected
- }
+ // NOTE: This second try is to make sure the state caching in the local repo properly replays the error
+ try
+ {
+ verifier.setLogFileName( "log-2.txt" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ fail( "Build did not fail despite broken checksum of dependency POM." );
}
- finally
+ catch ( VerificationException e )
{
- verifier.resetStreams();
+ // expected
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
index 3c9c5dc6b..74564292e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
@@ -60,7 +60,6 @@ public class MavenITmng3475BaseAlignedDirTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties configProps = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java
index f7b1bab36..21e5cdfb0 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
@@ -75,10 +75,6 @@ public class MavenITmng3477DependencyResolutionErrorMessageTest
}
assertTrue( "Transfer error cause was not found", foundCause );
}
- finally
- {
- verifier.resetStreams();
- }
}
}
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 3925659c8..aef3e4b74 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
@@ -57,7 +57,6 @@ public class MavenITmng3482DependencyPomInterpolationTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
assertTrue( classpath.toString(), classpath.contains( "dep2-1.jar" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
index 847f9282f..bbdf45321 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
@@ -54,6 +54,5 @@ public class MavenITmng3485OverrideWagonExtensionTest
verifier.verifyFilePresent( "target/wagon.properties" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java
index d6bc3dec6..d81cc0255 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java
@@ -60,13 +60,11 @@ public class MavenITmng3498ForkToOtherMojoTest
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java
index 283227e54..d57c5e2ad 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java
@@ -55,7 +55,6 @@ public class MavenITmng3503Xpp3ShadingTest
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
assertEquals( "<root />", FileUtils.fileRead( new File( dir, "target/serialized.xml" ), "UTF-8" ) );
}
@@ -72,7 +71,6 @@ public class MavenITmng3503Xpp3ShadingTest
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
assertEquals( "root", FileUtils.fileRead( new File( dir, "target/serialized.xml" ), "UTF-8" ) );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
index 478eb404e..31aed01c2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
@@ -63,7 +63,6 @@ public class MavenITmng3506ArtifactHandlersFromPluginsTest
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
// Now, if everything worked, we have .pom and a .jar in the local repo for each child, and a pom for the parent.
// IF IT DIDN'T, we have a .pom and a .coreit-1 for child 1 AND/OR .pom and .coreit-2 for child 2 in the local repo...
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 cbe967ef7..c127e1707 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
@@ -59,7 +59,6 @@ public class MavenITmng3529QuotedCliArgTest
verifier.addCliOption( "-Dtest.a= " );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "- -", props.getProperty( "project.properties.propA" ) );
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 53c8a1368..48e56123e 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
@@ -55,7 +55,6 @@ public class MavenITmng3535SelfReferentialPropertiesTest
verifier.executeGoal( "verify" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
@Test
@@ -82,7 +81,5 @@ public class MavenITmng3535SelfReferentialPropertiesTest
{
// should fail this verification, because there truly is a self-referential property.
}
-
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java
index 892fef9b1..e9ce054a5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java
@@ -52,13 +52,11 @@ public class MavenITmng3536AppendedAbsolutePathsTest
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
File projectDir = new File( testDir, "project" );
verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.executeGoal( "verify" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 10a985bc9..cb2d72af7 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
@@ -65,7 +65,6 @@ public class MavenITmng3545ProfileDeactivationTest
verifier.verifyFileNotPresent( "target/profile3/touch.txt" );
verifier.verifyFileNotPresent( "target/profile4/touch.txt" );
verifier.verifyFileNotPresent( "target/profile5/touch.txt" );
- verifier.resetStreams();
}
/**
@@ -94,7 +93,6 @@ public class MavenITmng3545ProfileDeactivationTest
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "target/profile1/touch.txt" );
verifier.verifyFileNotPresent( "target/profile2/touch.txt" );
- verifier.resetStreams();
}
@Test
@@ -118,7 +116,6 @@ public class MavenITmng3545ProfileDeactivationTest
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "target/profile1/touch.txt" );
verifier.verifyFileNotPresent( "target/profile2/touch.txt" );
- verifier.resetStreams();
}
/**
@@ -150,7 +147,6 @@ public class MavenITmng3545ProfileDeactivationTest
verifier.verifyFileNotPresent( "target/profile3/touch.txt" );
verifier.verifyFileNotPresent( "target/profile4/touch.txt" );
verifier.verifyFileNotPresent( "target/profile5/touch.txt" );
- verifier.resetStreams();
}
/**
@@ -182,7 +178,6 @@ public class MavenITmng3545ProfileDeactivationTest
verifier.verifyFileNotPresent( "target/profile3/touch.txt" );
verifier.verifyFileNotPresent( "target/profile4/touch.txt" );
verifier.verifyFileNotPresent( "target/profile5/touch.txt" );
- verifier.resetStreams();
}
/**
@@ -213,7 +208,6 @@ public class MavenITmng3545ProfileDeactivationTest
verifier.verifyFileNotPresent( "target/profile3/touch.txt" );
verifier.verifyFilePresent( "target/profile4/touch.txt" );
verifier.verifyFileNotPresent( "target/profile5/touch.txt" );
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java
index bbe1f2f31..f6ffdc3d2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java
@@ -55,7 +55,6 @@ public class MavenITmng3575HexadecimalOctalPluginParameterConfigTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties" );
assertEquals( "64", props.getProperty( "byteParam" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java
index 466b55ea6..fd55a1eab 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java
@@ -57,7 +57,6 @@ public class MavenITmng3581PluginUsesWagonDependencyTest
verifier.executeGoal( "initialize" );
verifier.addCliOption( "-B" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 df12d5d3c..cc80a3fe1 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
@@ -64,7 +64,6 @@ public class MavenITmng3586SystemScopePluginDependencyTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/it.properties" );
assertEquals( "PASSED", props.getProperty( "test" ) );
@@ -88,7 +87,6 @@ public class MavenITmng3586SystemScopePluginDependencyTest
verifier.getSystemProperties().setProperty( "test.home", testDir.getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pcl.properties" );
assertEquals( "1", props.getProperty( "maven-core-it.properties.count" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
index 1ae189760..a9c43d4da 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
@@ -170,7 +170,6 @@ public class MavenITmng3599useHttpProxyForWebDAVMk2Test
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
String settings = FileUtils.fileRead( new File( testDir, "settings-template.xml" ) );
settings = StringUtils.replace( settings, "@port@", Integer.toString( port ) );
@@ -189,7 +188,6 @@ public class MavenITmng3599useHttpProxyForWebDAVMk2Test
verifier.setLogFileName( "logHttp.txt" );
verifier.executeGoal( "compile" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" );
verifier.verifyArtifactContent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar",
@@ -215,7 +213,6 @@ public class MavenITmng3599useHttpProxyForWebDAVMk2Test
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
String settings = FileUtils.fileRead( new File( testDir, "settings-template.xml" ) );
settings = StringUtils.replace( settings, "@port@", Integer.toString( port ) );
@@ -234,7 +231,6 @@ public class MavenITmng3599useHttpProxyForWebDAVMk2Test
verifier.setLogFileName( "logDAV.txt" );
verifier.executeGoal( "compile" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" );
verifier.verifyArtifactContent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar",
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
index 3eaa8a1fe..2942bfcbb 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
@@ -53,7 +53,6 @@ public class MavenITmng3600DeploymentModeDefaultsTest
verifier.setLogFileName( "log-no-settings.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "wagon.properties" );
Properties props = verifier.loadProperties( "wagon.properties" );
@@ -75,7 +74,6 @@ public class MavenITmng3600DeploymentModeDefaultsTest
verifier.setLogFileName( "log-server-defaults.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "wagon.properties" );
Properties props = verifier.loadProperties( "wagon.properties" );
@@ -97,7 +95,6 @@ public class MavenITmng3600DeploymentModeDefaultsTest
verifier.setLogFileName( "log-modes-set.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "wagon.properties" );
Properties props = verifier.loadProperties( "wagon.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java
index 35875a531..df0f16cc0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java
@@ -60,7 +60,6 @@ public class MavenITmng3607ClassLoadersUseValidUrlsTest
verifier.getSystemProperties().setProperty( "test.home", testDir.getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pcl.properties" );
String url = props.getProperty( "maven-core-it.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java
index 02e82cacd..fa4288cdd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java
@@ -58,7 +58,6 @@ public class MavenITmng3621UNCInheritedPathsTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "file:////host/site/test-child", props.getProperty( "project.distributionManagement.site.url" ) );
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 eb8a047ea..86a83e9fa 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
@@ -60,7 +60,6 @@ public class MavenITmng3641ProfileActivationWarningTest
verifier.setLogFileName( "log-1.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> logFile = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
assertNull( findWarning( logFile, "mng-3641-it-provided-profile" ) );
@@ -72,7 +71,6 @@ public class MavenITmng3641ProfileActivationWarningTest
verifier.setLogFileName( "log-2.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
logFile = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
assertNotNull( findWarning( logFile, "mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p" ) );
@@ -85,7 +83,6 @@ public class MavenITmng3641ProfileActivationWarningTest
verifier.setLogFileName( "log-3.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
logFile = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
assertNull( findWarning( logFile, "mng-3641-it-provided-profile" ) );
@@ -98,7 +95,6 @@ public class MavenITmng3641ProfileActivationWarningTest
verifier.setLogFileName( "log-4.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
logFile = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
assertNull( findWarning( logFile, "mng-3641-it-provided-profile-child" ) );
@@ -110,7 +106,6 @@ public class MavenITmng3641ProfileActivationWarningTest
verifier.setLogFileName( "log-5.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
logFile = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
assertNull( findWarning( logFile, "mng-3641-it-provided-profile-child" ) );
@@ -122,7 +117,6 @@ public class MavenITmng3641ProfileActivationWarningTest
verifier.setLogFileName( "log-6.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
logFile = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
assertNull( findWarning( logFile, "mng-3641-it-provided-profile" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java
index 96b9a01f6..f10feb795 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java
@@ -83,12 +83,6 @@ public class MavenITmng3642DynamicResourcesTest
*/
verifier.verifyErrorFreeLog();
- /*
- * Reset the streams before executing the verifier
- * again.
- */
- verifier.resetStreams();
-
File first = new File( testDir, "target/test-classes/one.txt" );
assertTrue( "First resource file was not present: " + first, first.exists() );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java
index 475f60c0f..ae1e582cf 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java
@@ -70,10 +70,6 @@ public class MavenITmng3645POMSyntaxErrorTest
{
// expect this.
}
- finally
- {
- verifier.resetStreams();
- }
}
}
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 b7575989c..0ca3c5b86 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
@@ -123,7 +123,6 @@ public class MavenITmng3652UserAgentHeaderTest
Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
@@ -133,7 +132,6 @@ public class MavenITmng3652UserAgentHeaderTest
verifier.setLogFileName( "log-unConfiguredHttp.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
String userAgent = this.userAgent;
assertNotNull( userAgent );
@@ -166,7 +164,6 @@ public class MavenITmng3652UserAgentHeaderTest
Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
@@ -178,7 +175,6 @@ public class MavenITmng3652UserAgentHeaderTest
verifier.setLogFileName( "log-unConfiguredDAV.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
File touchFile = new File( projectDir, "target/touch.txt" );
assertTrue( touchFile.exists() );
@@ -211,7 +207,6 @@ public class MavenITmng3652UserAgentHeaderTest
Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
@@ -225,7 +220,6 @@ public class MavenITmng3652UserAgentHeaderTest
verifier.setLogFileName( "log-configWithoutUserAgent.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
File touchFile = new File( projectDir, "target/touch.txt" );
assertTrue( touchFile.exists() );
@@ -258,7 +252,6 @@ public class MavenITmng3652UserAgentHeaderTest
Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
@@ -272,7 +265,6 @@ public class MavenITmng3652UserAgentHeaderTest
verifier.setLogFileName( "log-configWithUserAgent.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
String userAgent = this.userAgent;
assertNotNull( userAgent );
@@ -292,7 +284,6 @@ public class MavenITmng3652UserAgentHeaderTest
Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
@@ -306,7 +297,6 @@ public class MavenITmng3652UserAgentHeaderTest
verifier.setLogFileName( "log-configWithUserAgent.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
String userAgent = this.userAgent;
assertNotNull( userAgent );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java
index a3428f6ee..583f8bd51 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
@@ -64,7 +64,6 @@ public class MavenITmng3667ResolveDepsWithBadPomVersionTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> cp = verifier.loadLines( "target/classpath.txt", "UTF-8" );
assertTrue( cp.toString(), cp.contains( "dep-0.1.jar" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java
index 4fb45a7ad..16cbe717c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java
@@ -67,11 +67,5 @@ public class MavenITmng3671PluginLevelDepInterpolationTest
* http://maven.apache.org/shared/maven-verifier/apidocs/index.html
*/
verifier.verifyErrorFreeLog();
-
- /*
- * Reset the streams before executing the verifier
- * again.
- */
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java
index 7f7925e24..a11d5a061 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java
@@ -53,7 +53,6 @@ public class MavenITmng3679PluginExecIdInterpolationTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/check.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java
index 2405914a1..97ff72bd3 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
@@ -61,7 +61,6 @@ public class MavenITmng3680InvalidDependencyPOMTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng3680:direct:jar:0.1" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java
index 171e77981..cecc803ee 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java
@@ -53,19 +53,16 @@ public class MavenITmng3684BuildPluginParameterTest
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.setLogFileName( "log-validate.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.setLogFileName( "log-site.txt" );
verifier.executeGoal( "site" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java
index 0c595d728..d3ecf5321 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java
@@ -58,7 +58,6 @@ public class MavenITmng3693PomFileBasedirChangeTest
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
String depPath = verifier.getArtifactPath( "org.apache.maven.its.mng3693", "dep", "1", "pom" );
@@ -73,7 +72,6 @@ public class MavenITmng3693PomFileBasedirChangeTest
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java
index fe4889fd0..182c22a3d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java
@@ -54,12 +54,10 @@ public class MavenITmng3694ReactorProjectsDynamismTest
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 43999a327..8ae2fe53b 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
@@ -59,7 +59,6 @@ public class MavenITmng3701ImplicitProfileIdTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
index 35c25034d..f6a111871 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
@@ -57,7 +57,6 @@ public class MavenITmng3703ExecutionProjectWithRelativePathsTest
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.setLogFileName( "log-mojo.txt" );
@@ -65,7 +64,6 @@ public class MavenITmng3703ExecutionProjectWithRelativePathsTest
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
@Test
@@ -83,7 +81,6 @@ public class MavenITmng3703ExecutionProjectWithRelativePathsTest
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.setLogFileName( "log-report.txt" );
@@ -91,6 +88,5 @@ public class MavenITmng3703ExecutionProjectWithRelativePathsTest
verifier.executeGoal( "site" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java
index db6816ed9..91be6d6ff 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java
@@ -59,13 +59,11 @@ public class MavenITmng3710PollutedClonedPluginsTest
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( projectsDir.getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
File topLevelTouchFile = new File( projectsDir, "target/touch.txt" );
assertFalse( "Top-level touch file should NOT be created in projects tree.", topLevelTouchFile.exists() );
@@ -92,7 +90,6 @@ public class MavenITmng3710PollutedClonedPluginsTest
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( projectDir.getAbsolutePath() );
@@ -103,6 +100,5 @@ public class MavenITmng3710PollutedClonedPluginsTest
verifier.executeGoals( goals );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 5bfc156ef..54088c224 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
@@ -70,7 +70,6 @@ public class MavenITmng3714ToolchainsCliOptionTest
verifier.addCliOption( "toolchains.xml" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/toolchains.properties" );
Properties results = verifier.loadProperties( "target/toolchains.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java
index 97953cfcc..b0dbdd904 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java
@@ -57,12 +57,10 @@ public class MavenITmng3716AggregatorForkingTest
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( projectsDir.getAbsolutePath() );
verifier.executeGoal( "org.apache.maven.its.mng3716:mavenit-mng3716-plugin:1:run" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java
index 98b84472d..c66c48faa 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java
@@ -60,7 +60,6 @@ public class MavenITmng3719PomExecutionOrderingTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Pattern pattern = Pattern.compile( ".*step-([0-9])\\.properties.*" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java
index 89c0e4bc5..fd44c86c3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java
@@ -62,12 +62,10 @@ public class MavenITmng3723ConcreteParentProjectTest
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java
index e1fc2d96a..ac27d0eb0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java
@@ -57,12 +57,10 @@ public class MavenITmng3724ExecutionProjectSyncTest
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java
index 34f5480b9..72342186f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java
@@ -71,12 +71,10 @@ public class MavenITmng3729MultiForkAggregatorsTest
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 a865531e5..fd7e320b7 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
@@ -71,7 +71,6 @@ public class MavenITmng3732ActiveProfilesTest
}
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/profile.properties" );
List<String> ids = new ArrayList<>();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java
index 5ad9fa79c..207256572 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java
@@ -58,12 +58,10 @@ public class MavenITmng3740SelfReferentialReactorProjectsTest
verifier = newVerifier( v1.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( v2.getAbsolutePath() );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 e1fc4ec63..70f6428b3 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
@@ -58,13 +58,11 @@ public class MavenITmng3746POMPropertyOverrideTest
verifier.setLogFileName( "log-sys.txt" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.setLogFileName( "log-sys.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
@Test
@@ -83,7 +81,6 @@ public class MavenITmng3746POMPropertyOverrideTest
verifier.setLogFileName( "log-cli.txt" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.setLogFileName( "log-cli.txt" );
@@ -94,6 +91,5 @@ public class MavenITmng3746POMPropertyOverrideTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java
index 40d03b512..98cc0dfb3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java
@@ -55,7 +55,6 @@ public class MavenITmng3747PrefixedPathExpressionTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties" );
assertEquals( "path is: " + new File( testDir, "relative" ).getCanonicalPath() + "/somepath",
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 435a3c22b..3f97b20e0 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
@@ -89,8 +89,6 @@ public class MavenITmng3748BadSettingsXmlTest
}
assertTrue( foundWarning );
}
-
- verifier.resetStreams();
}
}
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 50a55cbc7..9e5ebe54e 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
@@ -59,7 +59,6 @@ public class MavenITmng3766ToolchainsFromExtensionTest
verifier.addCliOption( "toolchains.xml" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/tool.properties" );
Properties toolProps = verifier.loadProperties( "target/tool.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java
index 68d0005b7..05cbe7764 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
@@ -63,7 +63,6 @@ public class MavenITmng3769ExclusionRelocatedTransdepsTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
assertEquals( Collections.singletonList( "org.apache.maven.its.mng3769:dependency:jar:1.0" ), artifacts );
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 5a52a15dc..753cb1592 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
@@ -102,7 +102,6 @@ public class MavenITmng3775ConflictResolutionBacktrackingTest
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> test = verifier.loadLines( "target/test.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java
index c9d8eae81..b3771dc8e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java
@@ -57,7 +57,6 @@ public class MavenITmng3796ClassImportInconsistencyTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
assertNotNull( pclProps.getProperty( "org.codehaus.plexus.util.xml.Xpp3Dom" ) );
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 41e0e25a8..bca5683bd 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
@@ -62,7 +62,6 @@ public class MavenITmng3805ExtensionClassPathOrderingTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties wclProps = verifier.loadProperties( "target/wcl.properties" );
String prefix = "org/apache/maven/its/mng3805/a.properties.";
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java
index 986634cb0..9afcdfcdc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java
@@ -57,7 +57,6 @@ public class MavenITmng3807PluginConfigExpressionEvaluationTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java
index 6c02a9fc4..3b6f98542 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java
@@ -59,7 +59,6 @@ public class MavenITmng3808ReportInheritanceOrderingTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/model.properties" );
Properties props = verifier.loadProperties( "target/model.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java
index caaa5c48b..9737e6c6f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java
@@ -59,7 +59,6 @@ public class MavenITmng3810BadProfileActivationTest
{
verifier.verifyTextInLog( "The property name is required to activate the profile" );
}
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java
index bfaa9162b..2008dc76d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java
@@ -58,7 +58,6 @@ public class MavenITmng3811ReportingPluginConfigurationInheritanceTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties" );
String p = "project.reporting.plugins.0.configuration.children.";
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 3f9acd8f5..4c0e98967 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
@@ -62,7 +62,6 @@ public class MavenITmng3813PluginClassPathOrderingTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java
index 2790dd7d4..8d6a951c5 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
@@ -60,7 +60,6 @@ public class MavenITmng3814BogusProjectCycleTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java
index e8e148716..8653dfbfa 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java
@@ -58,7 +58,6 @@ public class MavenITmng3821EqualPluginExecIdsTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java
index 15251c526..51dda810b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java
@@ -58,7 +58,6 @@ public class MavenITmng3822BasedirAlignedInterpolationTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties pomProps = verifier.loadProperties( "target/interpolated.properties" );
assertEquals( testDir, "src/main/java", pomProps.getProperty( "project.properties.buildMainSrc" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java
index 2e5c7dabd..bf541618d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java
@@ -58,7 +58,6 @@ public class MavenITmng3827PluginConfigTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/plugin-config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java
index 3756d690b..94f418636 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java
@@ -57,7 +57,6 @@ public class MavenITmng3831PomInterpolationTest
Verifier verifier = newVerifier( child.getAbsolutePath() );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/interpolated.properties" );
String prefix = "project.properties.";
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java
index c0a0e56b8..497d1b891 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java
@@ -59,7 +59,6 @@ public class MavenITmng3833PomInterpolationDataFlowChainTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/interpolated.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java
index 0186ac3bf..3e4dbf176 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java
@@ -58,7 +58,6 @@ public class MavenITmng3836PluginConfigInheritanceTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/plugin-config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java
index 57da30aae..71e632615 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java
@@ -55,7 +55,6 @@ public class MavenITmng3838EqualPluginDepsTest
verifier.setAutoclean( false );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java
index 22d1abc3b..e51e782e7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java
@@ -58,7 +58,6 @@ public class MavenITmng3839PomParsingCoalesceTextTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/xml.properties" );
assertEquals( "A Test Project Property", props.getProperty( "project.properties.prop0" ) );
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 d34b921e2..707d86687 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
@@ -68,7 +68,6 @@ public class MavenITmng3843PomInheritanceTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props;
File basedir;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java
index 6c78434d6..303872a35 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java
@@ -58,7 +58,6 @@ public class MavenITmng3845LimitedPomInheritanceTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "child-org", props.getProperty( "project.organization.name", "" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java
index f91c335f2..7a89c7ea7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java
@@ -58,7 +58,6 @@ public class MavenITmng3846PomInheritanceUrlAdjustmentTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "http://parent.url/child", props.getProperty( "project.url" ) );
@@ -92,7 +91,6 @@ public class MavenITmng3846PomInheritanceUrlAdjustmentTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "http://parent.url/ap/child", props.getProperty( "project.url" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java
index 0d6cb1bb7..73c1848a4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java
@@ -59,7 +59,6 @@ public class MavenITmng3852PluginConfigWithHeterogeneousListTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/plugin-config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java
index 735972252..901195264 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
@@ -63,7 +63,6 @@ public class MavenITmng3853ProfileInjectedDistReposTest
verifier.addCliOption( "-Pcoreit" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/dist.properties" );
assertEquals( "1", props.getProperty( "listParam" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java
index e7d49c85b..7206257e4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java
@@ -66,7 +66,6 @@ public class MavenITmng3863AutoPluginGroupIdTest
{
// expected
}
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java
index 2c0b53789..bd2a0ccbf 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java
@@ -58,7 +58,6 @@ public class MavenITmng3864PerExecPluginConfigTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/plugin-config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java
index 15101c7c5..03e21c10d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java
@@ -59,7 +59,6 @@ public class MavenITmng3866PluginConfigInheritanceTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/plugin-config.properties" );
assertEquals( "PASSED", props.getProperty( "stringParam" ) );
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 bd7b2c6f0..a993ad255 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
@@ -63,7 +63,6 @@ public class MavenITmng3872ProfileActivationInRelocatedPomTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> compileClassPath = verifier.loadLines( "target/compile.txt", "UTF-8" );
assertTrue( compileClassPath.toString(), compileClassPath.contains( "a-0.1.jar" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java
index 324d587ca..2db7f6951 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java
@@ -78,7 +78,6 @@ public class MavenITmng3873MultipleExecutionGoalsTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
/*
* NOTE: We deliberately don't check the exact order here, that's another issue.
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java
index e94309325..41b652cf6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java
@@ -59,7 +59,6 @@ public class MavenITmng3877BasedirAlignedModelTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties modelProps = verifier.loadProperties( "target/model.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java
index 6726fc354..6daa34eaa 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java
@@ -79,7 +79,6 @@ public class MavenITmng3886ExecutionGoalsOrderTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> lines = verifier.loadLines( "target/it.log", "UTF-8" );
assertEquals( Arrays.asList( new String[] { "test", "----" } ), lines );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java
index a77c2d41a..9f9c4fde3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java
@@ -79,7 +79,6 @@ public class MavenITmng3887PluginExecutionOrderTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> lines = verifier.loadLines( "target/it.log", "UTF-8" );
assertEquals( Arrays.asList( new String[] { "test", "----" } ), lines );
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 4a2eadedb..271c99ce5 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
@@ -63,7 +63,6 @@ public class MavenITmng3890TransitiveDependencyScopeUpdateTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng3890:c:jar:0.1" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java
index cbcf47a2b..6e28790c7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java
@@ -61,7 +61,6 @@ public class MavenITmng3892ReleaseDeploymentTest
verifier.deleteArtifacts( "org.apache.maven.its.mng3892" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3892", "test", "1.0", "pom" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3892", "test", "1.0", "jar" );
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 7a87cf9be..aef767602 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
@@ -62,7 +62,6 @@ public class MavenITmng3899ExtensionInheritanceTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/extension.properties" );
assertEquals( "3", props.getProperty( "project.build.extensions" ) );
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 963ea897f..fb867581c 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
@@ -59,7 +59,6 @@ public class MavenITmng3900ProfilePropertiesInterpolationTest
verifier.addCliOption( "-Pinterpolation-profile" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "PASSED", props.getProperty( "project.properties.test" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java
index 510327750..6da96283f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java
@@ -59,7 +59,6 @@ public class MavenITmng3904NestedBuildDirInterpolationTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertCanonicalFileEquals( new File( testDir, "target/classes/dir0" ),
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 0a4d832d5..3047628e1 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
@@ -62,7 +62,6 @@ public class MavenITmng3906MergedPluginClassPathOrderingTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java
index 353073cab..8a53a0bea 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java
@@ -61,7 +61,6 @@ public class MavenITmng3916PluginExecutionInheritanceTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> executions = verifier.loadLines( "target/exec.log", "UTF-8" );
// NOTE: Ordering of executions is another issue (MNG-3887), so ignore/normalize order
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java
index ccb1c8805..8e81e7e3c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java
@@ -59,7 +59,6 @@ public class MavenITmng3924XmlMarkupInterpolationTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/xml.properties" );
assertEquals( "<?xml version='1.0'?>Tom&Jerry", props.getProperty( "project.properties.xmlMarkup" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java
index 5774e9bbd..a33c3865f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java
@@ -79,7 +79,6 @@ public class MavenITmng3925MergedPluginExecutionOrderTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> lines = verifier.loadLines( "target/exec.log", "UTF-8" );
// Order is parent first and child appended, unless child overrides parent execution via equal id
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java
index ef8fab333..c2ac8c565 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java
@@ -58,7 +58,6 @@ public class MavenITmng3927PluginDefaultExecutionConfigTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "process-resources" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFileNotPresent( "target/failed.txt" );
verifier.verifyFilePresent( "target/resources-resources.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java
index 0f0c0173f..35cc2f17b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java
@@ -79,7 +79,6 @@ public class MavenITmng3937MergedPluginExecutionGoalsTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> lines = verifier.loadLines( "target/exec.log", "UTF-8" );
// Order is child first and parent appended but without duplicate goals
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java
index da73a96f1..03dcbc1bd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java
@@ -81,7 +81,6 @@ public class MavenITmng3938MergePluginExecutionsTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> lines = verifier.loadLines( "target/default.log", "UTF-8" );
assertEquals( Arrays.asList( new String[] { "child" } ), lines );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java
index 11dceaba7..fa0a6cf61 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java
@@ -76,7 +76,6 @@ public class MavenITmng3940EnvVarInterpolationTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate", envVars );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/PASSED.properties" );
Properties props = verifier.loadProperties( "target/PASSED.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java
index 2b6b75b69..c19c9ba9f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java
@@ -59,7 +59,6 @@ public class MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/fork.properties" );
assertEquals( "test-0.1", props.getProperty( "executedProject.build.finalName" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java
index 96fea1dc7..0bb5d6f2e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java
@@ -61,7 +61,6 @@ public class MavenITmng3943PluginExecutionInheritanceTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> executions = verifier.loadLines( "target/exec.log", "UTF-8" );
// NOTE: Ordering of executions is another issue (MNG-3887), so ignore/normalize order
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 55decb484..7592153ff 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
@@ -60,7 +60,6 @@ public class MavenITmng3944BasedirInterpolationTest
verifier.addCliOption( "pom-with-unusual-name.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/basedir.properties" );
Properties props = verifier.loadProperties( "target/basedir.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java
index 29fbd714e..2b9d3f980 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java
@@ -58,7 +58,6 @@ public class MavenITmng3947PluginDefaultExecutionConfigTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "org.apache.maven.plugins:maven-resources-plugin:resources" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFileNotPresent( "target/failed.txt" );
verifier.verifyFilePresent( "target/resources-resources.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
index d13562c2c..a572997f3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
@@ -60,7 +60,6 @@ public class MavenITmng3948ParentResolutionFromProfileReposTest
verifier.filterFile( "pom.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3948", "parent", "0.2", "pom" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java
index 281d1cc14..4df0b57ec 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java
@@ -71,7 +71,6 @@ public class MavenITmng3951AbsolutePathsTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/path.properties" );
Properties props = verifier.loadProperties( "target/path.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java
index 76abfde3c..c1c9c8316 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
@@ -174,7 +174,6 @@ public class MavenITmng3953AuthenticatedDeploymentTest
verifier.addCliOption( "-DdeploymentPort=" + port );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
assertTrue( deployed );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java
index c98cb3857..0d7033cdb 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
@@ -62,7 +62,6 @@ public class MavenITmng3955EffectiveSettingsTest
verifier.addCliOption( "--batch-mode" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/settings.properties" );
assertEquals( "true", props.getProperty( "settings.offline" ) );
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 f0b465906..227621916 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
@@ -60,7 +60,6 @@ public class MavenITmng3970DepResolutionFromProfileReposTest
verifier.filterFile( "pom.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3970", "a", "0.1", "jar" );
}
@@ -84,7 +83,6 @@ public class MavenITmng3970DepResolutionFromProfileReposTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3970", "a", "0.1", "jar" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java
index af7a43ab3..b50715136 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
@@ -61,7 +61,6 @@ public class MavenITmng3974MirrorOrderingTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3974", "a", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3974", "b", "0.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java
index 8acfdfe2a..0bfd10617 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java
@@ -59,7 +59,6 @@ public class MavenITmng3979ElementJoinTest
verifier.setAutoclean( false );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 3d7961412..5b2416fd1 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
@@ -62,7 +62,6 @@ public class MavenITmng3983PluginResolutionFromProfileReposTest
verifier.filterFile( "pom.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3983", "p", "0.1", "jar" );
}
@@ -88,7 +87,6 @@ public class MavenITmng3983PluginResolutionFromProfileReposTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng3983", "p", "0.1", "jar" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java
index 6388dd453..bf853596d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java
@@ -66,10 +66,6 @@ public class MavenITmng3991ValidDependencyScopeTest
{
// expected
}
- finally
- {
- verifier.resetStreams();
- }
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java
index 8856b25a9..473ba4e05 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java
@@ -60,7 +60,6 @@ public class MavenITmng3998PluginExecutionConfigTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> executions = verifier.loadLines( "target/exec.log", "UTF-8" );
// NOTE: Ordering of executions is another issue (MNG-3887), so ignore/normalize order
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java
index 6c09e57f9..fbe5c08e6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java
@@ -60,7 +60,6 @@ public class MavenITmng4000MultiPluginExecutionsTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> executions = verifier.loadLines( "target/exec.log", "UTF-8" );
List<String> expected = Arrays.asList( new String[] { "exec", "exec" } );
@@ -84,7 +83,6 @@ public class MavenITmng4000MultiPluginExecutionsTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> executions = verifier.loadLines( "target/exec.log", "UTF-8" );
List<String> expected = Arrays.asList( new String[] { "exec", "exec" } );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java
index 61acf898d..a26456f6f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java
@@ -105,7 +105,6 @@ public class MavenITmng4005UniqueDependencyKeyTest
{
// expected with Maven 4+
}
- verifier.resetStreams();
String logLevel;
if ( matchesVersionRange( "(,4.0.0-alpha-1)" ) )
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java
index 86267bfb5..d675da2f8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java
@@ -58,7 +58,6 @@ public class MavenITmng4007PlatformFileSeparatorTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties modelProps = verifier.loadProperties( "target/model.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java
index e7590a9a7..07a706157 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java
@@ -58,7 +58,6 @@ public class MavenITmng4008MergedFilterOrderTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties modelProps = verifier.loadProperties( "target/model.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java
index b1756cf6e..865f910d9 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
@@ -59,7 +59,6 @@ public class MavenITmng4009InheritProfileEffectsTest
verifier.addCliOption( "-Pparent-profile" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/profile.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java
index a46203b71..e244d6946 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java
@@ -59,7 +59,6 @@ public class MavenITmng4016PrefixedPropertyInterpolationTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/model.properties" );
Properties props = verifier.loadProperties( "target/model.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java
index 476c7230d..d63c3c4fa 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
@@ -59,7 +59,6 @@ public class MavenITmng4022IdempotentPluginConfigMergingTest
verifier.addCliOption( "-Pmng4022a,mng4022b" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties" );
assertEquals( "5", props.getProperty( "stringParams" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java
index ff5c9a638..f41918017 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java
@@ -60,7 +60,6 @@ public class MavenITmng4023ParentProfileOneTimeInjectionTest
verifier.deleteDirectory( "sub/target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "sub/target/config.properties" );
assertEquals( "1", props.getProperty( "stringParams" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java
index c12862e37..cab2f724a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java
@@ -60,7 +60,6 @@ public class MavenITmng4026ReactorDependenciesOrderTest
verifier.deleteDirectory( "consumer/target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> classpath1 = verifier.loadLines( "consumer/target/classpath-1.txt", "UTF-8" );
assertEquals( 5, classpath1.size() );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java
index 10d7aa161..8ffc3d423 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java
@@ -61,7 +61,6 @@ public class MavenITmng4034ManagedProfileDependencyTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
assertEquals( Arrays.asList( new String[0] ), artifacts );
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 23670fbaf..1b3af8d54 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
@@ -59,7 +59,6 @@ public class MavenITmng4036ParentResolutionFromSettingsRepoTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4036", "parent", "0.2", "pom" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java
index dd6c13f1b..682767a30 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java
@@ -56,7 +56,6 @@ public class MavenITmng4040ProfileInjectedModulesTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java
index b6981cbf9..562e23ee5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java
@@ -58,7 +58,6 @@ public class MavenITmng4048VersionRangeReactorResolutionTest
verifier.deleteArtifacts( "org.apache.maven.its.mng4048" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "sub-2/target/compile.txt", "UTF-8" );
assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4048:sub-1:jar:1.1-SNAPSHOT" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java
index ca99d1efc..10b2d6242 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java
@@ -58,7 +58,6 @@ public class MavenITmng4052ReactorAwareImportScopeTest
verifier.setAutoclean( false );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java
index db4a9f8eb..119addd5b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java
@@ -90,7 +90,6 @@ public class MavenITmng4053PluginConfigAttributesTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java
index b9682ca3f..4c5a5b227 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java
@@ -59,7 +59,6 @@ public class MavenITmng4056ClassifierBasedDepResolutionFromReactorTest
verifier.deleteArtifacts( "org.apache.maven.its.mng4056" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "consumer/target/artifacts.txt", "UTF-8" );
if ( matchesVersionRange( "[3.0-alpha-3,)" ) )
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 8cd13bd8b..8210911e5 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
@@ -140,7 +140,6 @@ public class MavenITmng4068AuthenticatedMirrorTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4068", "a", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4068", "b", "0.1-SNAPSHOT", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java
index 655e3e06e..1a0955983 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
@@ -62,7 +62,6 @@ public class MavenITmng4070WhitespaceTrimmingTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
assertEquals( Collections.singletonList( "org.apache.maven.its.mng4070:a:jar:0.1" ), artifacts );
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 bb9967a5b..82dc8c510 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
@@ -71,10 +71,6 @@ public class MavenITmng4072InactiveProfileReposTest
{
// expected, all profiles are inactive, hence the repos inaccessible
}
- finally
- {
- verifier.resetStreams();
- }
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java
index 039321c88..f81f2615f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java
@@ -58,7 +58,6 @@ public class MavenITmng4087PercentEncodedFileUrlTest
verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFileNotPresent( "target/%72%65%70%6F" );
verifier.verifyFilePresent( "target/repo" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java
index 1806226d8..39ab951ea 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java
@@ -61,10 +61,6 @@ public class MavenITmng4091BadPluginDescriptorTest
{
// expected...it'd be nice if we could get the specifics of the exception right here...
}
- finally
- {
- verifier.resetStreams();
- }
List<String> logFile = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
@@ -94,7 +90,6 @@ public class MavenITmng4091BadPluginDescriptorTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/plugin-dependency.properties" );
assertTrue( props.isEmpty() );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java
index 20cc23134..6bb6fa64d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java
@@ -81,7 +81,6 @@ public class MavenITmng4102InheritedPropertyInterpolationTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "CHILD", props.getProperty( "project.properties.overridden" ) );
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 1ac112cc6..a9df84899 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
@@ -69,7 +69,6 @@ public class MavenITmng4106InterpolationUsesDominantProfileTest
}
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java
index 4cbe117d5..1140245bb 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
@@ -61,7 +61,6 @@ public class MavenITmng4107InterpolationUsesDominantProfileSourceTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java
index 0b4b91e9c..7e75c9fc8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java
@@ -62,7 +62,6 @@ public class MavenITmng4112MavenVersionPropertyTest
assertTrue( testMavenBuildVersion, testMavenBuildVersion.contains( testMavenVersion ) );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java
index da473c819..b2c9a2923 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java
@@ -57,7 +57,6 @@ public class MavenITmng4116UndecodedUrlsTest
verifier.setAutoclean( false );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java
index a52ac665c..fa87a6570 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java
@@ -62,7 +62,6 @@ public class MavenITmng4129PluginExecutionInheritanceTest
verifier.deleteDirectory( "child-2/target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> executions = verifier.loadLines( "target/executions.txt", "UTF-8" );
Collections.sort( executions );
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 0d8276569..c638289aa 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
@@ -61,7 +61,6 @@ public class MavenITmng4150VersionRangeTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Collection<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
assertEquals( 4, artifacts.size() );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java
index 9dd727a8d..417cfd663 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java
@@ -58,7 +58,6 @@ public class MavenITmng4162ReportingMigrationTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
String p = "project.build.plugins.0.executions.0.configuration.children.";
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java
index 455b7da4d..75544afa2 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
@@ -64,7 +64,6 @@ public class MavenITmng4166HideCoreCommonsCliTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/class.properties" );
assertNotNull( props.getProperty( "org.apache.maven.its.mng4166.CoreIt" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java
index 8a651b35b..73f4011c1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java
@@ -58,7 +58,6 @@ public class MavenITmng4172EmptyDependencySetTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
assertEquals( new ArrayList<String>(), artifacts );
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 b71698f07..0991f752f 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
@@ -64,7 +64,6 @@ public class MavenITmng4180PerDependencyExclusionsTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
Collections.sort( artifacts );
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 72453ce86..724225779 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
@@ -60,7 +60,6 @@ public class MavenITmng4189UniqueVersionSnapshotTest
verifier.addCliOption( "settings.xml" );
verifier.setLogFileName( "log-1.txt" );
verifier.executeGoal( "validate" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
Properties checksums = verifier.loadProperties( "target/checksum.properties" );
@@ -76,7 +75,6 @@ public class MavenITmng4189UniqueVersionSnapshotTest
verifier.addCliOption( "dependent-on-newer-timestamp-pom.xml" );
verifier.setLogFileName( "log-2.txt" );
verifier.executeGoal( "validate" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
checksums = verifier.loadProperties( "target/checksum.properties" );
@@ -90,7 +88,6 @@ public class MavenITmng4189UniqueVersionSnapshotTest
verifier.addCliOption( "settings.xml" );
verifier.setLogFileName( "log-3.txt" );
verifier.executeGoal( "validate" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
checksums = verifier.loadProperties( "target/checksum.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java
index fdb6948ee..74f3a84c2 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
@@ -66,7 +66,6 @@ public class MavenITmng4190MirrorRepoMergingTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
Collections.sort( artifacts );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java
index 984ed8367..707510cf7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java
@@ -65,10 +65,6 @@ public class MavenITmng4193UniqueRepoIdTest
{
// expected
}
- finally
- {
- verifier.resetStreams();
- }
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java
index 100ac77a4..631a88a0b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java
@@ -58,7 +58,6 @@ public class MavenITmng4196ExclusionOnPluginDepTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
assertNull( pclProps.getProperty( "org.apache.maven.plugin.coreit.ClassA" ) );
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 18c1657d0..96612b98a 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
@@ -71,7 +71,6 @@ public class MavenITmng4199CompileMeetsRuntimeScopeTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> compileArtifacts = verifier.loadLines( "target/compile-artifacts.txt", "UTF-8" );
assertTrue( compileArtifacts.toString(), compileArtifacts.contains( "org.apache.maven.its.mng4199:system:jar:0.1" ) );
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 c644fb512..eb2c0110a 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
@@ -63,7 +63,6 @@ public class MavenITmng4203TransitiveDependencyExclusionTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
Collections.sort( artifacts );
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 f9e8b3629..0302b08f5 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
@@ -59,7 +59,6 @@ public class MavenITmng4207PluginWithLog4JTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 110ed1ca7..d4b491bf4 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
@@ -58,7 +58,6 @@ public class MavenITmng4208InterpolationPrefersCliOverProjectPropsTest
verifier.addCliOption( "-DtestProperty=PASSED" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "PASSED", props.getProperty( "project.properties.interpolatedProperty" ) );
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 cca302b0b..6e804144c 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
@@ -62,7 +62,6 @@ public class MavenITmng4214MirroredParentSearchReposTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4214", "parent", "0.1", "pom" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java
index a18f00b34..ce16f28dd 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
@@ -74,7 +74,6 @@ public class MavenITmng4231SnapshotUpdatePolicyTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties checksums = verifier.loadProperties( "target/checksum.properties" );
assertChecksum( "db3f17644e813af768ae6e82a6d0a2f29aef8988", "a-0.1-SNAPSHOT.jar", checksums );
@@ -114,7 +113,6 @@ public class MavenITmng4231SnapshotUpdatePolicyTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties checksums = verifier.loadProperties( "target/checksum.properties" );
assertChecksum( "ec6c9ea65766cc272df0ee26076240d6a93047d5", "a-0.1-SNAPSHOT.jar", checksums );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java
index 2223ae518..27ccad9e6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java
@@ -60,7 +60,6 @@ public class MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest
verifier.deleteDirectory( "consumer/target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "consumer/target/artifact.properties" );
assertEquals( new File( testDir.getCanonicalFile(), "producer/pom.xml" ), new File(
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 ec10c8de5..b5c8419e3 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
@@ -156,7 +156,6 @@ public class MavenITmng4235HttpAuthDeploymentChecksumsTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
assertHash( verifier, "repo/org/apache/maven/its/mng4235/test/0.1/test-0.1.jar", ".sha1", "SHA-1" );
assertHash( verifier, "repo/org/apache/maven/its/mng4235/test/0.1/test-0.1.jar", ".md5", "MD5" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
index 9c5ce48ec..68c244b20 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
@@ -62,7 +62,6 @@ public class MavenITmng4238ArtifactHandlerExtensionUsageTest
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
// Now, if everything worked, we have a .pom and a .jar in the local repo.
// IF IT DIDN'T, we have a .pom and a .coreit in the local repo...
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java
index 8eb26036d..772f302aa 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java
@@ -66,7 +66,6 @@ public class MavenITmng4262MakeLikeReactorDottedPath370Test
verifier.setLogFileName( "log-root.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFilePresent( "../sub-a/target/touch.txt" );
@@ -91,7 +90,6 @@ public class MavenITmng4262MakeLikeReactorDottedPath370Test
verifier.setLogFileName( "log-module.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFilePresent( "../sub-a/target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java
index 7fd650448..4563f2637 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
@@ -66,7 +66,6 @@ public class MavenITmng4262MakeLikeReactorDottedPathTest
verifier.setLogFileName( "log-root.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "../sub-a/target/touch.txt" );
@@ -91,7 +90,6 @@ public class MavenITmng4262MakeLikeReactorDottedPathTest
verifier.setLogFileName( "log-module.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFilePresent( "../sub-a/target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java
index 538aec68c..fc04003b2 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
@@ -66,7 +66,6 @@ public class MavenITmng4269BadReactorResolutionFromOutDirTest
// 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();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java
index 5e9e5b4b3..ee8e209fb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java
@@ -64,7 +64,6 @@ public class MavenITmng4270ArtifactHandlersFromPluginDepsTest
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
// Now, if everything worked, we have .pom and a .jar in the local repo.
// IF IT DIDN'T, we have a .pom and a .coreit in the local repo...
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java
index 621e6485d..7c97e4abe 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java
@@ -59,7 +59,6 @@ public class MavenITmng4273RestrictedCoreRealmAccessForPluginTest
verifier.setAutoclean( false );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/class.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java
index ac5e34e47..61cccd05d 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
@@ -66,7 +66,6 @@ public class MavenITmng4274PluginRealmArtifactsTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/class.properties" );
assertNotNull( props.getProperty( "org.apache.maven.its.mng4274.CoreIt" ) );
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 2ae3d96de..4e6de5ad0 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
@@ -61,7 +61,6 @@ public class MavenITmng4275RelocationWarningTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> lines = verifier.loadFile( new File( testDir, verifier.getLogFileName() ), false );
boolean foundWarning = false;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java
index 1775d6905..7573d7690 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
@@ -64,7 +64,6 @@ public class MavenITmng4276WrongTransitivePlexusUtilsTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/class.properties" );
assertNotNull( props.getProperty( "org.apache.maven.its.mng4276.CoreIt" ) );
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 1537ac322..cce28527e 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
@@ -59,7 +59,6 @@ public class MavenITmng4281PreferLocalSnapshotTest
verifier.deleteArtifacts( "org.apache.maven.its.mng4281" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4281", "dependency", "0.1-SNAPSHOT", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4281", "dependency", "0.1-SNAPSHOT", "pom" );
@@ -71,7 +70,6 @@ public class MavenITmng4281PreferLocalSnapshotTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties checksums = verifier.loadProperties( "target/checksum.properties" );
assertChecksum( "7c564b3fbeda6db61b62c35e58a8ef672e712400", checksums );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java
index 5f2d5a8d9..f65aa6025 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java
@@ -64,10 +64,6 @@ public class MavenITmng4283ParentPomPackagingTest
{
// expected
}
- finally
- {
- verifier.resetStreams();
- }
}
}
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 6a6a0dace..1e761d3db 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
@@ -68,10 +68,6 @@ public class MavenITmng4291MojoRequiresOnlineModeTest
{
// expected
}
- finally
- {
- verifier.resetStreams();
- }
}
/**
@@ -93,7 +89,6 @@ public class MavenITmng4291MojoRequiresOnlineModeTest
verifier.addCliOption( "--offline" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFileNotPresent( "target/touch.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java
index e579de138..b13737f80 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java
@@ -57,7 +57,6 @@ public class MavenITmng4292EnumTypeMojoParametersTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties" );
assertEquals( "HALF_EVEN", props.getProperty( "listParam.0" ) );
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 2a3f266c3..4e44b0b03 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
@@ -68,7 +68,6 @@ public class MavenITmng4293RequiresCompilePlusRuntimeScopeTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> compileClassPath = verifier.loadLines( "target/compile-cp.txt", "UTF-8" );
assertTrue( compileClassPath.toString(), compileClassPath.contains( "system-0.1.jar" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java
index f51891119..1aa51fd11 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java
@@ -58,7 +58,6 @@ public class MavenITmng4304ProjectDependencyArtifactsTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its:maven-core-it-support:jar:1.4" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java
index 8aa2f44fd..f4dc5bd7f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java
@@ -58,7 +58,6 @@ public class MavenITmng4305LocalRepoBasedirTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/basedir.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java
index 9792a7e5c..7fa8b62a6 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
@@ -70,7 +70,6 @@ public class MavenITmng4309StrictChecksumValidationForMetadataTest
{
// expected
}
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java
index 0c662a635..5c5c8a18b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java
@@ -59,7 +59,6 @@ public class MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java
index c6fef2021..537727b38 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java
@@ -61,7 +61,6 @@ public class MavenITmng4314DirectInvocationOfAggregatorTest
verifier.executeGoals( Arrays.asList( new String[] { "validate",
"org.apache.maven.its.plugins:maven-it-plugin-all:2.1-SNAPSHOT:aggregator-dependencies" } ) );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "consumer/target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java
index 073719188..8f8a79ef9 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
@@ -61,7 +61,6 @@ public class MavenITmng4317PluginVersionResolutionFromMultiReposTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "org.apache.maven.its.mng4317:maven-mng4317-plugin:touch" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java
index f23163d06..aea8695a9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java
@@ -61,7 +61,6 @@ public class MavenITmng4318ProjectExecutionRootTest
verifier.deleteDirectory( "sub-2/sub-3/target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java
index 157d056c1..86722b44a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java
@@ -56,7 +56,6 @@ public class MavenITmng4319PluginExecutionGoalInterpolationTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java
index 8c9f13c55..006e69e2a 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
@@ -62,7 +62,6 @@ public class MavenITmng4320AggregatorAndDependenciesTest
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<String> classpath;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java
index 4c86838ad..6798cda26 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java
@@ -58,7 +58,6 @@ public class MavenITmng4321CliUsesPluginMgmtConfigTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-log-file:2.1-SNAPSHOT:reset" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/passed.log" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java
index 7a2ab1d26..d3d65cd96 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
@@ -74,7 +74,6 @@ public class MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
final Deque<String> uris = new ConcurrentLinkedDeque<>();
@@ -187,7 +186,6 @@ public class MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest
}
finally
{
- verifier.resetStreams();
server.stop();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java
index 013ec2786..4a460e265 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java
@@ -58,7 +58,6 @@ public class MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "generate-sources" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> log = verifier.loadLines( "target/fork-lifecycle.txt", "UTF-8" );
assertEquals( 1, log.size() );
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 758eefe90..b980914f1 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
@@ -60,7 +60,6 @@ public class MavenITmng4328PrimitiveMojoParameterConfigurationTest
verifier.addCliOption( "--offline" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java
index e61dd930d..42891d2d8 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
@@ -61,7 +61,6 @@ public class MavenITmng4331DependencyCollectionTest
verifier.setLogFileName( "log-lifecycle.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "sub-2/target/compile.txt", "UTF-8" );
assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4331:sub-1:jar:0.1" ) );
@@ -88,7 +87,6 @@ public class MavenITmng4331DependencyCollectionTest
verifier.setLogFileName( "log-aggregator.txt" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-collection:2.1-SNAPSHOT:aggregate-test" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "target/sub-2.txt", "UTF-8" );
assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4331:sub-1:jar:0.1" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java
index 764b0e89a..07199e20a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java
@@ -60,7 +60,6 @@ public class MavenITmng4332DefaultPluginExecutionOrderTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "process-resources" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> lines = verifier.loadLines( "target/resources-resources.txt", "UTF-8" );
assertEquals( Arrays.asList( new String[] { "default", "test-1", "test-2" } ), lines );
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 326a2eb21..fa686c6d7 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
@@ -69,7 +69,6 @@ public class MavenITmng4335SettingsOfflineModeTest
{
// expected, should fail
}
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java
index ec81146d8..b191a1228 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java
@@ -57,7 +57,6 @@ public class MavenITmng4338OptionalMojosTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java
index 12d929751..e1f9e19f1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java
@@ -59,7 +59,6 @@ public class MavenITmng4341PluginExecutionOrderTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> lines = verifier.loadLines( "target/log.txt", "UTF-8" );
assertEquals( Arrays.asList( new String[] { "first", "second" } ), lines );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java
index b8eb20d6c..70aa597c4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java
@@ -58,7 +58,6 @@ public class MavenITmng4342IndependentMojoParameterDefaultValuesTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props1 = verifier.loadProperties( "target/config1.properties" );
assertEquals( "maven-core-it", props1.getProperty( "defaultParam" ) );
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 d009f2d8b..e42d1f471 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
@@ -190,7 +190,6 @@ public class MavenITmng4343MissingReleaseUpdatePolicyTest
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4343", "dep", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4343", "dep", "0.1", "pom" );
- verifier.resetStreams();
}
/**
@@ -273,7 +272,6 @@ public class MavenITmng4343MissingReleaseUpdatePolicyTest
//noinspection unchecked
assertTrue( requestedUris.isEmpty() );
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java
index db2c577be..3711223a2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java
@@ -60,7 +60,6 @@ public class MavenITmng4344ManagedPluginExecutionOrderTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "process-resources" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> lines = verifier.loadLines( "target/log.txt", "UTF-8" );
assertEquals( Arrays.asList( new String[] { "first", "second" } ), lines );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java
index 0baf10edb..d8313e123 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java
@@ -60,7 +60,6 @@ public class MavenITmng4345DefaultPluginExecutionOrderTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "process-resources" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> lines = verifier.loadLines( "target/log.txt", "UTF-8" );
assertEquals( Arrays.asList( new String[] { "first", "second" } ), lines );
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 9ca2ec133..9927d479d 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
@@ -68,7 +68,6 @@ public class MavenITmng4347ImportScopeWithSettingsProfilesTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 f9b3563c3..258a50c6f 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
@@ -111,7 +111,6 @@ public class MavenITmng4348NoUnnecessaryRepositoryAccessTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
finally
{
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java
index 514841fd3..660d0f220 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
@@ -63,7 +63,6 @@ public class MavenITmng4349RelocatedArtifactWithInvalidPomTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
assertTrue( classpath.toString(), classpath.contains( "new-0.1.jar" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java
index 69bdb1e00..6657e8339 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java
@@ -60,7 +60,6 @@ public class MavenITmng4350LifecycleMappingExecutionOrderTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "process-resources" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> lines = verifier.loadLines( "target/log.txt", "UTF-8" );
assertEquals( Arrays.asList( new String[] { "first", "second" } ), lines );
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 f782167c0..ad67ab9c4 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
@@ -66,7 +66,6 @@ public class MavenITmng4353PluginDependencyResolutionFromPomRepoTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/touch.properties" );
assertEquals( "passed", props.getProperty( "test" ) );
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 3d307aeaf..80ec8b0a7 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
@@ -62,7 +62,6 @@ public class MavenITmng4355ExtensionAutomaticVersionResolutionTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java
index 58a5cff6f..339d6e69b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java
@@ -60,7 +60,6 @@ public class MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/component.properties" );
assertEquals( "2", props.getProperty( "count" ) );
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 3ea0b6f07..cd8779eea 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
@@ -65,7 +65,6 @@ public class MavenITmng4357LifecycleMappingDiscoveryInReactorTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "mod-a/target/old.txt" );
verifier.verifyFileNotPresent( "mod-a/target/new.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java
index bd2241221..23b782e75 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java
@@ -60,7 +60,6 @@ public class MavenITmng4359LocallyReachableParentOutsideOfReactorTest
verifier.deleteArtifacts( "org.apache.maven.its.mng4359" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> cp = verifier.loadLines( "mod-c/target/classpath.txt", "UTF-8" );
assertTrue( cp.toString(), cp.contains( "mod-b/pom.xml" ) );
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 afef01d55..74cdcbcbd 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
@@ -145,7 +145,6 @@ public class MavenITmng4360WebDavSupportTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
finally
{
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java
index f34804d21..323ac1f0a 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
@@ -77,7 +77,6 @@ public class MavenITmng4361ForceDependencySnapshotUpdateTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties checksums = verifier.loadProperties( "target/checksum.properties" );
assertChecksum( "2a22eeca91211193e927ea3b2ecdf56481585064", "a-0.1-SNAPSHOT.jar", checksums );
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 34d2acd26..3557a7c2a 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
@@ -62,7 +62,6 @@ public class MavenITmng4363DynamicAdditionOfDependencyArtifactTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "generate-sources" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
assertTrue( classpath.toString(), classpath.contains( "a-0.1.jar" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java
index 036dbb01f..dff712a59 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java
@@ -55,7 +55,6 @@ public class MavenITmng4365XmlMarkupInAttributeValueTest
verifier.setAutoclean( false );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 fb9c3791b..c2f05c064 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
@@ -68,7 +68,6 @@ public class MavenITmng4367LayoutAwareMirrorSelectionTest
verifier.setLogFileName( "log-a.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4367", "dep", "0.1", "jar" );
}
@@ -99,7 +98,6 @@ public class MavenITmng4367LayoutAwareMirrorSelectionTest
verifier.setLogFileName( "log-b.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4367", "dep", "0.1", "jar" );
}
@@ -130,7 +128,6 @@ public class MavenITmng4367LayoutAwareMirrorSelectionTest
verifier.setLogFileName( "log-c.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4367", "dep", "0.1", "jar" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java
index 161dc8ad8..31559836b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java
@@ -67,7 +67,6 @@ public class MavenITmng4368TimestampAwareArtifactInstallerTest
verifier.deleteArtifacts( "org.apache.maven.its.mng4368" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
File installedPom =
new File( verifier.getArtifactPath( "org.apache.maven.its.mng4368", "test", "0.1-SNAPSHOT", "pom" ) );
@@ -85,7 +84,6 @@ public class MavenITmng4368TimestampAwareArtifactInstallerTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
pom = FileUtils.fileRead( installedPom, "UTF-8" );
assertFalse( pom.contains( "Branch-A" ) );
@@ -122,7 +120,6 @@ public class MavenITmng4368TimestampAwareArtifactInstallerTest
verifier.deleteArtifacts( "org.apache.maven.its.mng4368" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
File installedArtifact =
new File( verifier.getArtifactPath( "org.apache.maven.its.mng4368", "test", "0.1-SNAPSHOT", "jar" ) );
@@ -140,7 +137,6 @@ public class MavenITmng4368TimestampAwareArtifactInstallerTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
data = FileUtils.fileRead( installedArtifact, "UTF-8" );
assertFalse( data.contains( "Branch-A" ) );
@@ -156,7 +152,6 @@ public class MavenITmng4368TimestampAwareArtifactInstallerTest
verifier.setLogFileName( "log-b.txt" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
data = FileUtils.fileRead( installedArtifact, "UTF-8" );
assertFalse( data.contains( "Branch-B" ) );
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 55e0b02a9..ddc78756d 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
@@ -63,7 +63,6 @@ public class MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate", Collections.singletonMap( "MNG_4379_HOME", testDir.getAbsolutePath() ) );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
assertTrue( classpath.toString(), classpath.contains( "pom.xml" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java
index 4f8e14db2..2b97cc35a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java
@@ -59,7 +59,6 @@ public class MavenITmng4381ExtensionSingletonComponentTest
verifier.deleteDirectory( "sub-b/target" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "sub-b/target/singleton.properties" );
assertEquals( "called", props.getProperty( "sub-a-provider" ) );
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 21bf95c1e..78d3a8ae9 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
@@ -65,10 +65,6 @@ public class MavenITmng4383ValidDependencyVersionTest
{
// expected
}
- finally
- {
- verifier.resetStreams();
- }
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java
index 60235c759..ca5ac8b55 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java
@@ -69,7 +69,6 @@ public class MavenITmng4385LifecycleMappingFromExtensionInReactorTest
assertTrue( "Failure should be due to unknown packaging", msg.contains( "Unknown packaging: it-packaging" ));
assertTrue( "Failure should be due to sub-b project", msg.contains( "The project org.apache.maven.its.mng4385:sub-b:0.1" ));
}
- verifier.resetStreams();
}
}
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 6484d94dd..7fb666593 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
@@ -59,7 +59,6 @@ public class MavenITmng4386DebugLoggingTest
verifier.setLogFileName( "log.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> lines = verifier.loadLines( "log.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java
index 447f8b6fc..09676dbf4 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
@@ -60,7 +60,6 @@ public class MavenITmng4387QuietLoggingTest
verifier.setLogFileName( "log.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> lines = verifier.loadLines( "log.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java
index afb85b202..7c1c5d3cd 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
@@ -60,7 +60,6 @@ public class MavenITmng4393ParseExternalParenPomLenientTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java
index bc961bb60..41cc6575c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java
@@ -57,7 +57,6 @@ public class MavenITmng4396AntBased20xMojoSupportTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/ant.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java
index 8a79ce73a..867bd1686 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
@@ -60,7 +60,6 @@ public class MavenITmng4400RepositoryOrderTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties checksums = verifier.loadProperties( "target/checksum.properties" );
assertChecksum( "d0a4998ff37a55f8de1dffccdff826eca365400f", checksums );
@@ -85,7 +84,6 @@ public class MavenITmng4400RepositoryOrderTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties checksums = verifier.loadProperties( "target/checksum.properties" );
assertChecksum( "d0a4998ff37a55f8de1dffccdff826eca365400f", checksums );
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 5dc6df26f..57a393afe 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
@@ -61,7 +61,6 @@ public class MavenITmng4401RepositoryOrderForParentPomTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/passed.txt" );
verifier.verifyFileNotPresent( "target/failed.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java
index 876cd0f12..ff864e3dd 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
@@ -66,10 +66,6 @@ public class MavenITmng4402DuplicateChildModuleTest
{
// expected
}
- finally
- {
- verifier.resetStreams();
- }
}
}
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 a75f15a7a..9e65f9995 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
@@ -65,7 +65,6 @@ public class MavenITmng4403LenientDependencyPomParsingTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
Collections.sort( artifacts );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java
index fcfea472a..f190d14b8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java
@@ -65,10 +65,6 @@ public class MavenITmng4404UniqueProfileIdTest
{
// expected
}
- finally
- {
- verifier.resetStreams();
- }
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java
index a1e0709cf..c9a24b2ad 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java
@@ -65,10 +65,6 @@ public class MavenITmng4405ValidPluginVersionTest
{
// expected
}
- finally
- {
- verifier.resetStreams();
- }
}
}
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 4763e6386..9e48e12ee 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
@@ -67,10 +67,6 @@ public class MavenITmng4408NonExistentSettingsFileTest
{
// expected
}
- finally
- {
- verifier.resetStreams();
- }
}
/**
@@ -99,10 +95,6 @@ public class MavenITmng4408NonExistentSettingsFileTest
{
// expected
}
- finally
- {
- verifier.resetStreams();
- }
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java
index 641887c8e..78beeb190 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java
@@ -55,7 +55,6 @@ public class MavenITmng4410UsageHelpTest
verifier.setAutoclean( false );
verifier.executeGoal( "--help" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyTextInLog( "--version" );
verifier.verifyTextInLog( "--debug" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java
index 0685a7fb0..590feac3c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java
@@ -55,7 +55,6 @@ public class MavenITmng4411VersionInfoTest
verifier.setAutoclean( false );
verifier.executeGoal( "--version" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyTextInLog( "Maven" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java
index be0d0ba5e..bf6f2aa05 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
@@ -73,10 +73,6 @@ public class MavenITmng4412OfflineModeInPluginTest
{
// expected
}
- finally
- {
- verifier.resetStreams();
- }
}
/**
@@ -103,7 +99,6 @@ public class MavenITmng4412OfflineModeInPluginTest
verifier.setLogFileName( "log-collector.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactNotPresent( "org.apache.maven.its.mng4412", "dep", "0.1", "pom" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java
index 113febb26..dcb5316f7 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
@@ -117,7 +117,6 @@ public class MavenITmng4413MirroringOfDependencyRepoTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4413", "a", "0.1", "jar" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java
index cf26dbc46..37d8dd8a8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java
@@ -62,7 +62,6 @@ public class MavenITmng4415InheritedPluginOrderTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/it.properties" );
assertNotNull( props.getProperty( "project.build.plugins" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java
index a8f2b26dc..187b2b927 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java
@@ -62,7 +62,6 @@ public class MavenITmng4416PluginOrderAfterProfileInjectionTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/it.properties" );
assertNotNull( props.getProperty( "project.build.plugins" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java
index 1394089b3..fad1f46bf 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java
@@ -62,7 +62,6 @@ public class MavenITmng4421DeprecatedPomInterpolationExpressionsTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "0.1", props.getProperty( "project.properties.property1" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java
index 3f35cfaf0..a6d6ef869 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java
@@ -56,7 +56,6 @@ public class MavenITmng4422PluginExecutionPhaseInterpolationTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java
index a806ff782..f2a46ddbd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java
@@ -58,7 +58,6 @@ public class MavenITmng4423SessionDataFromPluginParameterExpressionTest
verifier.getSystemProperties().setProperty( "mng4423", "PASSED" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties" );
assertEquals( "PASSED", props.getProperty( "propertiesParam.mng4423" ) );
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 0dae9476e..1f80c9b2f 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
@@ -148,7 +148,6 @@ public class MavenITmng4428FollowHttpRedirectTest
verifier.setLogFileName( "log-" + getName().substring( 6 ) + ".txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
finally
{
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java
index e5d3a6ce8..ab3887b98 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java
@@ -57,7 +57,6 @@ public class MavenITmng4429CompRequirementOnNonDefaultImplTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/comp.properties" );
assertEquals( "concrete", props.getProperty( "id" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java
index 3c8c0d95a..d75e9f17c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java
@@ -66,10 +66,6 @@ public class MavenITmng4430DistributionManagementStatusTest
{
// expected
}
- finally
- {
- verifier.resetStreams();
- }
}
}
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 d153bfa7a..4b0649b73 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
@@ -78,7 +78,6 @@ public class MavenITmng4433ForceParentSnapshotUpdateTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFileNotPresent( "target/old.txt" );
verifier.verifyFilePresent( "target/new.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java
index 12608c191..385f74232 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java
@@ -57,7 +57,6 @@ public class MavenITmng4436SingletonComponentLookupTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/comp.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java
index 0fca26d11..10c1f0479 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
@@ -60,7 +60,6 @@ public class MavenITmng4450StubModelForMissingDependencyPomTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java
index f37f9b09a..37ea18682 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
@@ -74,7 +74,6 @@ public class MavenITmng4452ResolutionOfSnapshotWithClassifierTest
verifier.setLogFileName( "log-3.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( new File( testDir, "consumer" ).getAbsolutePath() );
verifier.setAutoclean( false );
@@ -85,7 +84,6 @@ public class MavenITmng4452ResolutionOfSnapshotWithClassifierTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
assertTrue( artifacts.toString(),
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java
index 7238c8e99..8ffebd32c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java
@@ -57,7 +57,6 @@ public class MavenITmng4453PluginVersionFromLifecycleMappingTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "process-resources" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/resources-resources.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java
index f7aac7972..089014b7f 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
@@ -62,7 +62,6 @@ public class MavenITmng4459InMemorySettingsKeptEncryptedTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/settings.properties" );
assertEquals( "{BteqUEnqHecHM7MZfnj9FwLcYbdInWxou1C929Txa0A=}",
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java
index d7607190e..92a4487a3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java
@@ -56,7 +56,6 @@ public class MavenITmng4461ArtifactUploadMonitorTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyTextInLog( "/target/repo/org/apache/maven/its/mng4461/release/1.0/release-1.0.jar" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java
index 652d52a14..8d7e20353 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java
@@ -52,7 +52,6 @@ public class MavenITmng4463DependencyManagementImportVersionRanges
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
final List<String> artifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven:maven-plugin-api:jar:3.0" ) );
@@ -68,7 +67,6 @@ public class MavenITmng4463DependencyManagementImportVersionRanges
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven:maven-plugin-api:jar:3.0" ) );
@@ -94,10 +92,6 @@ public class MavenITmng4463DependencyManagementImportVersionRanges
assertTrue( "Expected error message not found.",
indexOf( lines, ".*dependency version range.*does not specify an upper bound.*" ) >= 0 );
}
- finally
- {
- verifier.resetStreams();
- }
}
private static int indexOf( final List<String> logLines, final String regex )
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java
index a09b976cb..11ab4474c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java
@@ -59,7 +59,6 @@ public class MavenITmng4464PlatformIndependentFileSeparatorTest
verifier.deleteArtifacts( "org.apache.maven.its.mng4464" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "../sub/target/path.properties" );
Properties props = verifier.loadProperties( "../sub/target/path.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java
index 2bf125221..a0b57370d 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
@@ -65,7 +65,6 @@ public class MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "mng4465:touch" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.properties" );
@@ -81,7 +80,6 @@ public class MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "mng4465:touch" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.properties" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java
index 86f8e1246..688160b48 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
@@ -161,7 +161,6 @@ public class MavenITmng4469AuthenticatedDeploymentToCustomRepoTest
verifier.addCliArgument( "-DrepositoryUrl=http://localhost:" + port + "/repo" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-artifact:2.1-SNAPSHOT:deploy-file" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
assertTrue( deployed );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java
index 28b983503..93fd50093 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
@@ -228,7 +228,6 @@ public class MavenITmng4470AuthenticatedDeploymentToProxyTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
for ( DeployedResource deployedResource : deployedResources )
{
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java
index bfe2d2a53..e34c25472 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java
@@ -57,7 +57,6 @@ public class MavenITmng4474PerLookupWagonInstantiationTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/wagon.properties" );
String hash1 = props.getProperty( "coreit://one.hash" );
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 b83822527..5c144ac6b 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
@@ -63,7 +63,6 @@ public class MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest
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();
Properties props = verifier.loadProperties( "target/param.properties" );
assertEquals( "org.apache.maven.plugin.coreit.ItImpl-passed", props.getProperty( "theParameter.string" ) );
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 8c49134c9..9321856fd 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
@@ -86,7 +86,6 @@ public class MavenITmng4482ForcePluginSnapshotUpdateTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props2 = verifier.loadProperties( "target/touch.properties" );
assertEquals( "new", props2.getProperty( "two" ) );
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 c4970cbb6..5c54188da 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
@@ -60,7 +60,6 @@ public class MavenITmng4488ValidateExternalParenPomLenientTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 8403e9634..07ecd0d7c 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
@@ -117,7 +117,6 @@ public class MavenITmng4489MirroringOfExtensionRepoTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4489", "ext-dep", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4489", "ext-dep", "0.1", "pom" );
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 f24c52256..c62691248 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
@@ -61,7 +61,6 @@ public class MavenITmng4498IgnoreBrokenMetadataTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
assertTrue( classpath.toString(), classpath.contains( "dep-0.1-SNAPSHOT.jar" ) );
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 3ba1d0e69..ba2bd584b 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
@@ -133,7 +133,6 @@ public class MavenITmng4500NoUpdateOfTimestampedSnapshotsTest
}
finally
{
- verifier.resetStreams();
server.stop();
server.join();
}
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 5c691c1f0..f811e52b1 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
@@ -69,10 +69,6 @@ public class MavenITmng4522FailUponMissingDependencyParentPomTest
{
// expected
}
- finally
- {
- verifier.resetStreams();
- }
}
}
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 963d5fce2..011707a81 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
@@ -62,7 +62,6 @@ public class MavenITmng4526MavenProjectArtifactsScopeTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "generate-sources" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java
index dca6c01fc..09900ecab 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java
@@ -61,7 +61,6 @@ public class MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/wagon.properties" );
String version = props.getProperty( "version", "" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java
index 05866b441..032e3b1e0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java
@@ -58,7 +58,6 @@ public class MavenITmng4536RequiresNoProjectForkingMojoTest
verifier.deleteDirectory( "mod-b/target" );
verifier.executeGoal( "generate-sources" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
assertEquals( 2, verifier.loadLines( "mod-a/target/touch.log", "UTF-8" ).size() );
assertEquals( 2, verifier.loadLines( "mod-b/target/touch.log", "UTF-8" ).size() );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java
index 843809b7c..f4784be90 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java
@@ -57,7 +57,6 @@ public class MavenITmng4544ActiveComponentCollectionThreadSafeTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/thread.properties" );
assertEquals( 0, Integer.parseInt( props.getProperty( "exceptions" ) ) );
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 c88acfc1c..b1c26f42d 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
@@ -61,7 +61,6 @@ public class MavenITmng4553CoreArtifactFilterConsidersGroupIdTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
assertNotNull( pclProps.getProperty( "mng4553.properties" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java
index 2178a7123..0bdbf1f9b 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
@@ -137,7 +137,6 @@ public class MavenITmng4554PluginPrefixMappingUpdateTest
}
finally
{
- verifier.resetStreams();
server.stop();
server.join();
}
@@ -225,7 +224,6 @@ public class MavenITmng4554PluginPrefixMappingUpdateTest
}
finally
{
- verifier.resetStreams();
server.stop();
server.join();
}
@@ -319,7 +317,6 @@ public class MavenITmng4554PluginPrefixMappingUpdateTest
}
finally
{
- verifier.resetStreams();
server.stop();
server.join();
}
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 6e20ffb06..b13263eb4 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
@@ -113,7 +113,6 @@ public class MavenITmng4555MetaversionResolutionOfflineTest
}
finally
{
- verifier.resetStreams();
server.stop();
server.join();
}
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 12fc80527..603d12461 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
@@ -117,7 +117,6 @@ public class MavenITmng4561MirroringOfPluginRepoTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4561", "plugin-dep", "0.1", "jar" );
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4561", "plugin-dep", "0.1", "pom" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java
index 52f142745..616455111 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java
@@ -70,7 +70,6 @@ public class MavenITmng4565MultiConditionProfileActivationTest
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/profile1/touch.txt" );
verifier.verifyFileNotPresent( "target/profile2/touch.txt" );
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java
index f1e5fc822..653881f53 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java
@@ -55,7 +55,6 @@ public class MavenITmng4572ModelVersionSurroundedByWhitespaceTest
verifier.setAutoclean( false );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java
index 5b140c597..128357167 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java
@@ -60,7 +60,6 @@ public class MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest
verifier.deleteDirectory( "sub/target" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-class-loader:load" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties pclProps;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java
index 9df63b524..b70fba6bf 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java
@@ -61,7 +61,6 @@ public class MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "mng4586:touch" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java
index 6172373fe..07b47eadc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java
@@ -63,7 +63,6 @@ public class MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "1", props.getProperty( "project.dependencyManagement.dependencies" ) );
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 2cbc98de6..fa02ecb71 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
@@ -59,7 +59,6 @@ public class MavenITmng4600DependencyOptionalFlagManagementTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "dep", props.getProperty( "project.dependencies.0.artifactId" ) );
@@ -87,7 +86,6 @@ public class MavenITmng4600DependencyOptionalFlagManagementTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
assertTrue( classpath.toString(), classpath.contains( "direct-0.2.jar" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java
index 0b25aa49e..7f843b699 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java
@@ -59,7 +59,6 @@ public class MavenITmng4615ValidateRequiredPluginParameterTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties" );
assertEquals( "one", props.get( "requiredParam" ) );
@@ -93,7 +92,6 @@ public class MavenITmng4615ValidateRequiredPluginParameterTest
// expected
}
- verifier.resetStreams();
}
/**
@@ -115,7 +113,6 @@ public class MavenITmng4615ValidateRequiredPluginParameterTest
verifier.setLogFileName( "log-b.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties" );
assertEquals( "CLI", props.get( "requiredParam" ) );
@@ -151,7 +148,6 @@ public class MavenITmng4615ValidateRequiredPluginParameterTest
// expected
}
- verifier.resetStreams();
}
/**
@@ -171,7 +167,6 @@ public class MavenITmng4615ValidateRequiredPluginParameterTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties" );
assertEquals( "one", props.get( "requiredParam" ) );
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 d991c95f4..60d489642 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
@@ -58,7 +58,6 @@ public class MavenITmng4618AggregatorBuiltAfterModulesTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> mods = verifier.loadLines( "target/log.txt", "UTF-8" );
assertEquals( Arrays.asList( new String[] { "mod-a", "mod-b", "mod-c", "aggregator" } ), mods );
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 a6274673d..17fc03cb9 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
@@ -75,7 +75,6 @@ public class MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "&x=y<>", props.getProperty( "project.properties.jdbcUrl" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java
index f7f0c9313..282eca48c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java
@@ -56,7 +56,6 @@ public class MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest
verifier.setAutoclean( false );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
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 0476f00da..e48a33747 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
@@ -61,7 +61,6 @@ public class MavenITmng4633DualCompilerExecutionsWeaveModeTest
verifier.addCliOption( "2W" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java
index b5a705a36..c99399daa 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java
@@ -65,10 +65,6 @@ public class MavenITmng4644StrictPomParsingRejectsMisplacedTextTest
{
// expected
}
- finally
- {
- verifier.resetStreams();
- }
}
}
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 659b411a7..fcb3806fc 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
@@ -61,7 +61,6 @@ public class MavenITmng4654ArtifactHandlerForMainArtifactTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFileNotPresent( "target/repo/org/apache/maven/its/mng4654/test/1.0/test-1.0.mng4654" );
verifier.verifyFilePresent( "target/repo/org/apache/maven/its/mng4654/test/1.0/test-1.0.jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java
index 0bbdeeccc..438013101 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java
@@ -71,7 +71,6 @@ public class MavenITmng4660OutdatedPackagedArtifact extends AbstractMavenIntegra
Path module1Jar = testDir.toPath().resolve( "module-a/target/module-a-1.0.jar" ).toAbsolutePath();
verifier1.verifyErrorFreeLog();
verifier1.verifyFilePresent( module1Jar.toString() );
- verifier1.resetStreams();
if ( System.getProperty( "java.version", "" ).startsWith( "1." ) )
{
@@ -103,7 +102,6 @@ public class MavenITmng4660OutdatedPackagedArtifact extends AbstractMavenIntegra
.toAbsolutePath();
verifier2.verifyErrorFreeLog();
verifier2.verifyFilePresent( module1Class.toString() );
- verifier2.resetStreams();
// 3. Resume project build from module B, that depends on module A we just touched. Its packaged artifact
// is no longer in sync with its compiled artifacts.
@@ -173,6 +171,5 @@ public class MavenITmng4660OutdatedPackagedArtifact extends AbstractMavenIntegra
throw new VerificationException( message.toString(), e.getCause() );
}
- verifier3.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
index e7b49706c..a45a6eef4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
@@ -65,10 +65,6 @@ public class MavenITmng4660ResumeFromTest extends AbstractMavenIntegrationTestCa
{
verifier1.verifyTextInLog( "Deliberately fail test case" );
}
- finally
- {
- verifier1.resetStreams();
- }
final Verifier verifier2 = newVerifier( testDir.getAbsolutePath() );
verifier2.setAutoclean( false );
@@ -77,7 +73,6 @@ public class MavenITmng4660ResumeFromTest extends AbstractMavenIntegrationTestCa
verifier2.executeGoal( "compile" ); // to prevent the unit test from failing (again)
verifier2.verifyErrorFreeLog();
- verifier2.resetStreams();
}
/**
@@ -105,10 +100,6 @@ public class MavenITmng4660ResumeFromTest extends AbstractMavenIntegrationTestCa
{
verifier1.verifyTextInLog( "Deliberately fail test case" );
}
- finally
- {
- verifier1.resetStreams();
- }
final Verifier verifier2 = newVerifier( testDir.getAbsolutePath() );
verifier2.setAutoclean( false );
@@ -117,6 +108,5 @@ public class MavenITmng4660ResumeFromTest extends AbstractMavenIntegrationTestCa
verifier2.executeGoal( "compile" ); // to prevent the unit test from failing (again)
verifier2.verifyErrorFreeLog();
- verifier2.resetStreams();
}
}
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 3ef9698d6..77b558229 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
@@ -82,7 +82,6 @@ public class MavenITmng4666CoreRealmImportTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/type.properties" );
List<String> types = getTypes( props );
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 e9da8b243..71edfed71 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
@@ -60,7 +60,6 @@ public class MavenITmng4677DisabledPluginConfigInheritanceTest
verifier.deleteDirectory( "child-2/target" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-log-file:2.1-SNAPSHOT:log-string" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> log = verifier.loadLines( "target/log.txt", "UTF-8" );
assertEquals( Arrays.asList( new String[] { "parent-only" } ), log );
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 55059f06c..e58bce1cc 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
@@ -78,7 +78,6 @@ public class MavenITmng4679SnapshotUpdateInPluginTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
assertChecksum( verifier, "jar", "f3d46277c2ab45ff9bbd97605c942bed7fc27f97" );
assertChecksum( verifier, "pom", "127f0dc26035352bb54890315ad7d2ada067756a" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java
index c08a1849d..8261b813b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java
@@ -58,7 +58,6 @@ public class MavenITmng4684DistMgmtOverriddenByProfileTest
verifier.addCliOption( "-Pmng4684" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java
index 5b832b5b9..d8afaa099 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
@@ -105,7 +105,6 @@ public class MavenITmng4690InterdependentConflictResolutionTest
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java
index 0bd6912e2..935483c49 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
@@ -63,7 +63,6 @@ public class MavenITmng4696MavenProjectDependencyArtifactsTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/artifact.properties" );
assertEquals( "3", props.getProperty( "project.dependencyArtifacts.size" ) );
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 6aac5649c..2a07cb1a5 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
@@ -61,7 +61,6 @@ public class MavenITmng4720DependencyManagementExclusionMergeTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java
index 4860918f5..e78ebdcc1 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
@@ -60,7 +60,6 @@ public class MavenITmng4721OptionalPluginDependencyTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pcl.properties" );
assertEquals( "1", props.get( "org/apache/maven/plugin/coreit/c.properties.count" ) );
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 dc88cb7e7..1a3c31441 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
@@ -117,7 +117,6 @@ public class MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "PASSED", props.get( "org.apache.maven.its.mng4729:a:jar:0.1.project.name" ) );
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 7971e8ead..65dc98499 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
@@ -72,7 +72,6 @@ public class MavenITmng4745PluginVersionUpdateTest
verifier.executeGoal( "org.apache.maven.its.mng4745:maven-it-plugin:touch" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/plugin.properties" );
assertEquals( "1.1", props.get( "plugin.version" ) );
@@ -108,7 +107,6 @@ public class MavenITmng4745PluginVersionUpdateTest
verifier.executeGoal( "org.apache.maven.its.mng4745:maven-it-plugin:touch" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/plugin.properties" );
assertEquals( "1.0", props.get( "plugin.version" ) );
@@ -145,7 +143,6 @@ public class MavenITmng4745PluginVersionUpdateTest
verifier.executeGoal( "org.apache.maven.its.mng4745:maven-it-plugin:touch" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/plugin.properties" );
assertEquals( "1.1", props.get( "plugin.version" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java
index 1c3abbbb5..ee286d0b1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java
@@ -61,7 +61,6 @@ public class MavenITmng4747JavaAgentUsedByPluginTest
verifier.setEnvironmentVariable( "MAVEN_OPTS", "-javaagent:agent.jar" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props1 = verifier.loadProperties( "target/agent.properties" );
Properties props2 = verifier.loadProperties( "target/plugin.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java
index d617a1986..53b5704cb 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
@@ -62,7 +62,6 @@ public class MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/artifact.properties" );
assertEquals( "1", props.getProperty( "project.dependencyArtifacts.size" ) );
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 63cef3997..3cb18d4fe 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
@@ -60,7 +60,6 @@ public class MavenITmng4755FetchRemoteMetadataForVersionRangeTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
// test: resolve remote version
verifier = newVerifier( new File( testDir, "test" ).getAbsolutePath() );
@@ -71,7 +70,6 @@ public class MavenITmng4755FetchRemoteMetadataForVersionRangeTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> cp = verifier.loadLines( "target/classpath.txt", "UTF-8" );
assertTrue( cp.toString(), cp.contains( "dep-1.jar" ) );
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 9e31507f7..8eadf9bf3 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
@@ -66,7 +66,6 @@ public class MavenITmng4761PluginLevelDependencyScopesTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java
index 53ef13fbf..174051463 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java
@@ -58,7 +58,6 @@ public class MavenITmng4765LocalPomProjectBuilderTest
verifier.addCliArgument( "-Duser.prop=OK" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "PASSED - OK", props.get( "test.xml.project.name" ) );
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 4f5cb342d..3a14e4a74 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
@@ -106,7 +106,6 @@ public class MavenITmng4768NearestMatchConflictResolutionTest
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java
index 5a1cfba6e..0c1e05b1f 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
@@ -112,7 +112,6 @@ public class MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest
}
finally
{
- verifier.resetStreams();
server.stop();
server.join();
}
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 8c56dcdcb..0ef3bd926 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
@@ -113,7 +113,6 @@ public class MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest
}
finally
{
- verifier.resetStreams();
server.stop();
server.join();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java
index 287f96940..d9ba54099 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java
@@ -60,7 +60,6 @@ public class MavenITmng4776ForkedReactorPluginVersionResolutionTest
verifier.setLogFileName( "log-lifecycle.txt" );
verifier.executeGoal( "test" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "sub/target/log.txt" );
}
@@ -85,7 +84,6 @@ public class MavenITmng4776ForkedReactorPluginVersionResolutionTest
verifier.setLogFileName( "log-cli.txt" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-fork:2.1-SNAPSHOT:fork-lifecycle-aggregator" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "sub/target/log.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java
index a88e6f4d5..7ec466544 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
@@ -59,7 +59,6 @@ public class MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest
verifier.deleteArtifacts( "org.apache.maven.its.mng4779" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> classpath = verifier.loadLines( "test/target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java
index eb61684d4..6231863ca 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
@@ -140,7 +140,6 @@ public class MavenITmng4781DeploymentToNexusStagingRepoTest
verifier.addCliOption( "-DdeploymentPort=" + port );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
assertTrue( deployedUris.contains( "/repo/org/apache/maven/its/mng4781/release/1.0/release-1.0.jar" ) );
assertTrue( deployedUris.contains( "/repo/org/apache/maven/its/mng4781/release/1.0/release-1.0.pom" ) );
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 a7dce789c..54ce412f9 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
@@ -62,7 +62,6 @@ public class MavenITmng4785TransitiveResolutionInForkedThreadTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/artifacts.properties" );
String path = props.getProperty( "org.apache.maven.its.mng4785:dep:jar:0.1-SNAPSHOT", "" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java
index 5b3c57895..68f8cc2ff 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java
@@ -59,7 +59,6 @@ public class MavenITmng4786AntBased21xMojoSupportTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/ant.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java
index f09eb7da0..0e8e0371f 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
@@ -56,7 +56,6 @@ public class MavenITmng4788InstallationToCustomLocalRepoTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/local-repo/test-0.1-SNAPSHOT.jar" );
verifier.verifyFileNotPresent( "target/local-repo/org/apache/maven/its/mng4788/test/0.1-SNAPSHOT/test-0.1-SNAPSHOT.jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java
index fb66934ff..9296ea1c5 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
@@ -62,7 +62,6 @@ public class MavenITmng4789ScopeInheritanceMeetsConflictTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
assertFalse( compile.toString(), compile.contains( "a-0.1.jar" ) );
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 38a6234db..31fd740a9 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
@@ -62,7 +62,6 @@ public class MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java
index ea1db3ce9..ab353c2b4 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
@@ -59,7 +59,6 @@ public class MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest
verifier.deleteDirectory( "sub/target" );
verifier.executeGoal( "process-sources" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> compile0 = verifier.loadLines( "sub/target/compile-0.txt", "UTF-8" );
assertTrue( compile0.toString(), compile0.contains( "maven-core-it-support-1.0.jar" ) );
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 cef802a9d..492069624 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
@@ -74,7 +74,6 @@ public class MavenITmng4800NearestWinsVsScopeWideningTest
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java
index 79b21e7e8..08c8877c8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java
@@ -55,7 +55,6 @@ public class MavenITmng4811CustomComponentConfiguratorTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties" );
assertEquals( "PASSED", props.getProperty( "stringParam" ) );
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 85d41a4f7..3044ed497 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
@@ -67,7 +67,6 @@ public class MavenITmng4814ReResolutionOfDependenciesDuringReactorTest
goals.add( "validate" );
verifier.executeGoals( goals );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> compile = verifier.loadLines( "consumer/target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java
index c8d48ccdc..424c29c24 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
@@ -61,7 +61,6 @@ public class MavenITmng4829ChecksumFailureWarningTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> lines = verifier.loadFile( new File( testDir, verifier.getLogFileName() ), false );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java
index bd998dee4..c91c34d0c 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
@@ -62,7 +62,6 @@ public class MavenITmng4834ParentProjectResolvedFromRemoteReposTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "PASSED", props.getProperty( "project.parent.description" ) );
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 af1a20275..dc7868e5b 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
@@ -68,10 +68,6 @@ public class MavenITmng4840MavenPrerequisiteTest
{
// expected, unsolvable version conflict
}
- finally
- {
- verifier.resetStreams();
- }
}
/**
@@ -95,7 +91,6 @@ public class MavenITmng4840MavenPrerequisiteTest
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "org.apache.maven.its.mng4840:maven-mng4840-plugin:touch" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch-1.txt" );
verifier.verifyFileNotPresent( "target/touch-2.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java
index 7e1edbcc8..7cc8f7573 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
@@ -63,7 +63,6 @@ public class MavenITmng4842ParentResolutionOfDependencyPomTest
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
@@ -93,7 +92,6 @@ public class MavenITmng4842ParentResolutionOfDependencyPomTest
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng4842", "parent", "0.1", "pom" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java
index 87f15b51a..99a05019a 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
@@ -58,7 +58,6 @@ public class MavenITmng4872ReactorResolutionAttachedWithExclusionsTest
verifier.deleteArtifacts( "org.apache.maven.its.mng4872" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "consumer/target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java
index cf417014c..de14bc59e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java
@@ -58,7 +58,6 @@ public class MavenITmng4874UpdateLatestPluginVersionTest
verifier.deleteArtifacts( "org.apache.maven.its.mng4874" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
File metadataFile = new File( testDir, "target/repo/org/apache/maven/its/mng4874/test/maven-metadata.xml" );
String xml = FileUtils.fileRead( metadataFile, "UTF-8" );
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 b712a345e..473903f51 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
@@ -59,7 +59,6 @@ public class MavenITmng4877DeployUsingPrivateKeyTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/wagon.properties" );
assertEquals( "testuser", props.get( "username" ) );
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 236fed13c..4c72f5765 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
@@ -68,10 +68,6 @@ public class MavenITmng4883FailUponOverconstrainedVersionRangesTest
{
// expected, unsolvable version conflict
}
- finally
- {
- verifier.resetStreams();
- }
}
}
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 4e701e869..f26039cbf 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
@@ -63,7 +63,6 @@ public class MavenITmng4890MakeLikeReactorConsidersVersionsTest
verifier.setLogFileName( "log-am.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "mod-b/target/touch.txt" );
verifier.verifyFileNotPresent( "mod-a/target/touch.txt" );
@@ -93,7 +92,6 @@ public class MavenITmng4890MakeLikeReactorConsidersVersionsTest
verifier.setLogFileName( "log-amd.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "mod-a/target/touch.txt" );
verifier.verifyFileNotPresent( "mod-b/target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java
index f4ec3a56b..76d0348cc 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
@@ -59,14 +59,12 @@ public class MavenITmng4891RobustSnapshotResolutionTest
verifier.deleteArtifacts( "org.apache.maven.its.mng4891" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( new File( testDir, "consumer" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java
index 85dd3dd1e..9deedc091 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
@@ -61,7 +61,6 @@ public class MavenITmng4895PluginDepWithNonRelocatedMavenApiTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/classpath.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java
index aa80c2f53..39fd59024 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
@@ -62,7 +62,6 @@ public class MavenITmng4913UserPropertyVsDependencyPomPropertyTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java
index 723d7ba81..955092673 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
@@ -58,7 +58,6 @@ public class MavenITmng4919LifecycleMappingWithSameGoalTwiceTest
verifier.deleteDirectory( "target" );
verifier.executeGoals( Arrays.asList( new String[] { "clean", "validate" } ) );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> lines = verifier.loadLines( "target/log.txt", "UTF-8" );
assertEquals( Arrays.asList( new String[] { "check", "check" } ), lines );
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 f5362bff4..7c24dc2a7 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
@@ -61,7 +61,6 @@ public class MavenITmng4925ContainerLookupRealmDuringMojoExecTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java
index 4f6f6be4d..675da17a2 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
@@ -60,7 +60,6 @@ public class MavenITmng4936EventSpyTest
verifier.addCliOption( "-X" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> lines = verifier.loadLines( "target/spy.log", "UTF-8" );
assertTrue( lines.toString(), lines.get( 0 ).toString().startsWith( "init" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java
index 05308e151..e37aa0dc1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java
@@ -72,7 +72,6 @@ public class MavenITmng4952MetadataReleaseInfoUpdateTest
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
File metadataFile = new File( testDir, "target/repo/org/apache/maven/its/mng4952/test/maven-metadata.xml" );
String xml = FileUtils.fileRead( metadataFile, "UTF-8" );
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 3103a6799..ae2158a59 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,7 +59,6 @@ public class MavenITmng4955LocalVsRemoteSnapshotResolutionTest
verifier.deleteArtifacts( "org.apache.maven.its.mng4955" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
@@ -69,7 +68,6 @@ public class MavenITmng4955LocalVsRemoteSnapshotResolutionTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java
index 4d238646b..190244bb3 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
@@ -65,7 +65,6 @@ public class MavenITmng4960MakeLikeReactorResumeTest
verifier.setLogFileName( "log-up.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "mod-a/target/touch.txt" );
verifier.verifyFilePresent( "mod-b/target/touch.txt" );
@@ -97,7 +96,6 @@ public class MavenITmng4960MakeLikeReactorResumeTest
verifier.setLogFileName( "log-down.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFileNotPresent( "mod-a/target/touch.txt" );
verifier.verifyFilePresent( "mod-b/target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java
index e8ba4389b..d66023f4b 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
@@ -62,7 +62,6 @@ public class MavenITmng4963ParentResolutionFromMirrorTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java
index dd83c406f..5651613f9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java
@@ -57,7 +57,6 @@ public class MavenITmng4966AbnormalUrlPreservationTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "file:////UNC/server/dir/", props.getProperty( "project.url" ) );
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 3a8eec106..23340e673 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
@@ -63,7 +63,6 @@ public class MavenITmng4973ExtensionVisibleToPluginInReactorTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "sub-b/target/artifact.properties" );
assertNotNull( props.get( "org.apache.maven.its.mng4973:dep:it-artifact:it:0.1" ) );
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 24a3f0d51..6e389dce6 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
@@ -59,7 +59,6 @@ public class MavenITmng4975ProfileInjectedPluginExecutionOrderTest
verifier.addCliOption( "-Pprofile2,profile1" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> lines = verifier.loadLines( "target/exec.log", "UTF-8" );
List<String> expected = Arrays.asList( new String[] { "1", "2", "3", "4", "5" } );
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 cda19c1b8..cac1edeb8 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
@@ -62,7 +62,6 @@ public class MavenITmng4987TimestampBasedSnapshotSelectionTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java
index 01cc1f10c..bef9c1f2a 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
@@ -108,7 +108,6 @@ public class MavenITmng4991NonProxyHostsTest
}
finally
{
- verifier.resetStreams();
server.stop();
proxy.stop();
server.join();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java
index b4f43508a..d3543c864 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java
@@ -55,7 +55,6 @@ public class MavenITmng4992MapStylePropertiesParamConfigTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties" );
assertEquals( "mapValue", props.getProperty( "mapParam.mapKey" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java
index b37f81053..d10f60f75 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java
@@ -60,7 +60,6 @@ public class MavenITmng5000ChildPathAwareUrlInheritanceTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "http://project.url/child", props.getProperty( "project.url" ) );
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 747e6465f..9ef9dac49 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
@@ -64,7 +64,6 @@ public class MavenITmng5006VersionRangeDependencyParentResolutionTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java
index 5495b83dc..98491285a 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
@@ -62,10 +62,6 @@ public class MavenITmng5009AggregationCycleTest
{
verifier.verifyTextInLog( " cycle " );
}
- finally
- {
- verifier.resetStreams();
- }
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java
index 90e1e3421..5fdfcd886 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java
@@ -58,7 +58,6 @@ public class MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest
verifier.addCliArgument( "-Dconfig.listParam=,two,,four," );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java
index 880d2a6ee..7b8137dd2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java
@@ -56,7 +56,6 @@ public class MavenITmng5012CollectionVsArrayParamCoercionTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties" );
assertEquals( new File( testDir, "src/main/java" ).getCanonicalFile(),
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java
index 52b8f57f8..47e70a440 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java
@@ -55,7 +55,6 @@ public class MavenITmng5013ConfigureParamBeanFromScalarValueTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties" );
assertEquals( "PASSED", props.getProperty( "beanParam.fieldParam" ) );
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 47cec1ab6..0b7601309 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
@@ -60,7 +60,6 @@ public class MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java
index d90ab1017..fa6435daa 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
@@ -134,7 +134,6 @@ public class MavenITmng5064SuppressSnapshotUpdatesTest
}
finally
{
- verifier.resetStreams();
server.stop();
server.join();
}
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 d3184e05a..f0c46e599 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
@@ -63,7 +63,6 @@ public class MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> compile = verifier.loadLines( "target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java
index 286fd3537..aa81d7b05 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
@@ -61,7 +61,6 @@ public class MavenITmng5135AggregatorDepResolutionModuleExtensionTest
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<String> compile = verifier.loadLines( "target/module.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java
index 8a6ae4b06..f62804934 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
@@ -63,7 +63,6 @@ public class MavenITmng5137ReactorResolutionInForkedBuildTest
verifier.executeGoal(
"org.apache.maven.its.plugins:maven-it-plugin-fork:2.1-SNAPSHOT:fork-lifecycle-aggregator" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> compile = verifier.loadLines( "consumer/target/compile.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java
index 59963949b..381155a07 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
@@ -138,6 +138,5 @@ public class MavenITmng5175WagonHttpTest
verifier.verifyTextInLog(
"Could not transfer artifact org.apache.maven.its.mng5175:fake-dependency:pom:1.0-SNAPSHOT" );
verifier.verifyTextInLog( "Read timed out" );
- verifier.resetStreams();
}
}
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 cb7f47b89..2bfeda4af 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
@@ -59,7 +59,6 @@ public class MavenITmng5206PlexusLifecycleHonoured
verifier.deleteArtifacts( "org.apache.maven.its.mng5206" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyTextInLog( "MojoWithPlexusLifecycle :: contextualize" );
verifier.verifyTextInLog( "DefaultFakeComponent :: contextualize" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java
index 30b67b5da..5ce50d55f 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
@@ -62,7 +62,6 @@ public class MavenITmng5208EventSpyParallelTest
verifier.addCliOption( "-fn" );
verifier.executeGoal( "compile" );
verifier.verifyTextInLog( "ProjectFailed/org.apache.maven.its.mng5208:sub-2" );
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java
index 4aebcd94f..05b7c5fec 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java
@@ -60,7 +60,6 @@ public class MavenITmng5222MojoDeprecatedTest
verifier.setLogFileName( "log-empty-configuration.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
List<String> warnLines = findDeprecationWarning( logLines );
@@ -112,7 +111,6 @@ public class MavenITmng5222MojoDeprecatedTest
verifier.setLogFileName( "log-deprecated-property.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
List<String> warnLines = findDeprecationWarning( logLines );
@@ -180,7 +178,6 @@ public class MavenITmng5222MojoDeprecatedTest
verifier.setLogFileName( "log-deprecated-config.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
List<String> warnLines = findDeprecationWarning( logLines );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java
index a5eff6a29..eb749bc07 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java
@@ -69,7 +69,6 @@ public class MavenITmng5230MakeReactorWithExcludesTest
verifier.setLogFileName( "log-only.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFilePresent( "mod-a/target/touch.txt" );
@@ -98,7 +97,6 @@ public class MavenITmng5230MakeReactorWithExcludesTest
verifier.setLogFileName( "log-upstream.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "mod-a/target/touch.txt" );
@@ -127,7 +125,6 @@ public class MavenITmng5230MakeReactorWithExcludesTest
verifier.setLogFileName( "log-downstream.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "mod-a/target/touch.txt" );
@@ -157,7 +154,6 @@ public class MavenITmng5230MakeReactorWithExcludesTest
verifier.setLogFileName( "log-both.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "mod-a/target/touch.txt" );
@@ -186,7 +182,6 @@ public class MavenITmng5230MakeReactorWithExcludesTest
verifier.setLogFileName( "log-basedir-exclamation.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFilePresent( "mod-a/target/touch.txt" );
@@ -215,7 +210,6 @@ public class MavenITmng5230MakeReactorWithExcludesTest
verifier.setLogFileName( "log-basedir-minus.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFilePresent( "mod-a/target/touch.txt" );
@@ -244,7 +238,6 @@ public class MavenITmng5230MakeReactorWithExcludesTest
verifier.setLogFileName( "log-id.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFilePresent( "mod-a/target/touch.txt" );
@@ -272,7 +265,6 @@ public class MavenITmng5230MakeReactorWithExcludesTest
verifier.setLogFileName( "log-artifact-id.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/touch.txt" );
verifier.verifyFilePresent( "mod-a/target/touch.txt" );
@@ -302,7 +294,6 @@ public class MavenITmng5230MakeReactorWithExcludesTest
verifier.setLogFileName( "log-resume.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFileNotPresent( "target/touch.txt" );
verifier.verifyFileNotPresent( "mod-a/target/touch.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java
index e3c2b41f8..9658acaa0 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
@@ -108,7 +108,6 @@ public class MavenITmng5280SettingsProfilesRepositoriesOrderTest
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
assertTrue( repoHandler.artifactRequestedFromRepo2 );
assertTrue( repoHandler.artifactRequestedFromRepo1Last );
@@ -144,7 +143,6 @@ public class MavenITmng5280SettingsProfilesRepositoriesOrderTest
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "org.apache.maven.its.mng5280:fake-maven-plugin:1.0:fake" );
- verifier.resetStreams();
assertTrue( pluginRepoHandler.pluginRequestedFromRepo2 );
assertTrue( pluginRepoHandler.pluginRequestedFromRepo1Last );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java
index 9b4377c51..fdce5e841 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
@@ -65,7 +65,6 @@ public class MavenITmng5338FileOptionToDirectory
verifier.addCliOption( "project" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java
index 9fe114949..4dfc63e88 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java
@@ -63,7 +63,6 @@ public class MavenITmng5382Jsr330Plugin
v0.deleteArtifacts( "org.apache.maven.its.mng5382" );
v0.executeGoal( "install" );
v0.verifyErrorFreeLog();
- v0.resetStreams();
//
// Execute the JSR330 plugin
@@ -72,7 +71,6 @@ public class MavenITmng5382Jsr330Plugin
v1.setAutoclean( false );
v1.executeGoal( "org.apache.maven.its.mng5382:jsr330-maven-plugin:0.0.1-SNAPSHOT:hello" );
v1.verifyErrorFreeLog();
- v1.resetStreams();
v1.verifyTextInLog( "Hello! I am a component that is being used via constructor injection! That's right, I'm a JSR330 badass." );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java
index affd5c56a..f6471dd67 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java
@@ -56,7 +56,6 @@ public class MavenITmng5387ArtifactReplacementPlugin
v0.deleteArtifacts( "org.apache.maven.its.mng5387" );
v0.executeGoal( "install" );
v0.verifyErrorFreeLog();
- v0.resetStreams();
String path = v0.getArtifactPath( "org.apache.maven.its.mng5387", "mng5387-it", "0.0.1-SNAPSHOT", "txt", "c" );
String contents = FileUtils.fileRead( new File( path ), "utf-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java
index aae54787c..1a6837b48 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java
@@ -48,13 +48,11 @@ public class MavenITmng5389LifecycleParticipantAfterSessionEnd
// install the test plugin
verifier = newVerifier( extensionDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
// build the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "package" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/afterSessionEnd.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java
index 0550eb310..11522c766 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java
@@ -58,7 +58,6 @@ public class MavenITmng5418FileProjectPropertiesActivatorTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/path1.txt" );
verifier.verifyFilePresent( "target/file1.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java
index 9156dad4e..8e0bbdbb7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java
@@ -54,7 +54,6 @@ public class MavenITmng5445LegacyStringSearchModelInterpolatorTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java
index b61f08d93..d9756775a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java
@@ -85,10 +85,6 @@ public class MavenITmng5482AetherNotFoundTest
{
// expected...it'd be nice if we could get the specifics of the exception right here...
}
- finally
- {
- verifier.resetStreams();
- }
List<String> lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java
index 9ff05cd22..1ae65d6a7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java
@@ -59,7 +59,6 @@ public class MavenITmng5503ZipInReactorTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "verify" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
index 5232e7294..f005f5ff3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
@@ -47,13 +47,11 @@ public class MavenITmng5530MojoExecutionScopeTest
// install the test plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
// build the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "package" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
// verifier.verifyFilePresent( "target/execution-failure.txt" );
@@ -74,7 +72,6 @@ public class MavenITmng5530MojoExecutionScopeTest
// install the test plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
// build the test project
@@ -84,7 +81,6 @@ public class MavenITmng5530MojoExecutionScopeTest
verifier.addCliOption( "-T" );
verifier.addCliOption( "1" );
verifier.executeGoal( "package" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
// verifier.verifyFilePresent( "target/execution-failure.txt" );
@@ -106,13 +102,11 @@ public class MavenITmng5530MojoExecutionScopeTest
// install the test extension
verifier = newVerifier( extensionDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
// install the test plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
// build the test project
@@ -120,7 +114,6 @@ public class MavenITmng5530MojoExecutionScopeTest
verifier.addCliOption( "-Dmaven.ext.class.path=" + new File( extensionDir, "target/classes" ).getAbsolutePath() );
verifier.setForkJvm( true ); // verifier does not support custom realms in embedded mode
verifier.executeGoal( "package" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java
index 6c5f7ae96..d990bc152 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java
@@ -67,7 +67,6 @@ public class MavenITmng5557ProperlyRestrictedReactor
{
// the execution should fail due to a resolution error.
}
- verifier.resetStreams();
verifier.verifyTextInLog( "Could not resolve dependencies for project org.apache.maven.its.mng5557:project-0:jar:1.0: Could not find artifact org.apache.maven.its.mng5557:project-4:jar:1.0" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java
index e5e3a00e7..e912c6b12 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java
@@ -50,17 +50,14 @@ public class MavenITmng5561PluginRelocationLosesConfigurationTest
verifier = newVerifier( oldPluginWithRelocationDir.getAbsolutePath() );
verifier.executeGoal( "install" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
verifier = newVerifier( newPluginDir.getAbsolutePath() );
verifier.executeGoal( "install" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.executeGoal( "verify" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
verifier.verifyTextInLog( "[WARNING] Hello from Maven!" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java
index 31f14813e..5fdb52fe1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java
@@ -60,7 +60,6 @@ public class MavenITmng5572ReactorPluginExtensionsTest
setup.addCliOption( "plugin/pom.xml" );
setup.executeGoal( "install" );
setup.verifyErrorFreeLog();
- setup.resetStreams();
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setLogFileName( "log2.txt" );
@@ -75,7 +74,6 @@ public class MavenITmng5572ReactorPluginExtensionsTest
{
verifier.verifyTextInLog( "[WARNING] 'project' uses 'org.apache.maven.its.mng5572:plugin' as extension which is not possible within the same reactor build. This plugin was pulled from the local repository!" );
}
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java
index 4e18dde54..3cb64d0f1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java
@@ -60,7 +60,6 @@ public class MavenITmng5576CdFriendlyVersions
verifier.addCliOption( "-Dmaven.experimental.buildconsumer=false" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "1.0.0.changelist", props.getProperty( "project.version" ) );
@@ -92,7 +91,6 @@ public class MavenITmng5576CdFriendlyVersions
verifier.addCliOption( "-Dmaven.experimental.buildconsumer=true" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "1.0.0.changelist", props.getProperty( "project.version" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java
index fd420b4bc..d1dd04b07 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java
@@ -47,14 +47,12 @@ public class MavenITmng5578SessionScopeTest
// install the test plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
// build the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.addCliOption( "-Dit-build-extensions=false" );
verifier.executeGoal( "package" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
}
@@ -71,7 +69,6 @@ public class MavenITmng5578SessionScopeTest
// install the test plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
// build the test project
@@ -82,7 +79,6 @@ public class MavenITmng5578SessionScopeTest
verifier.addCliOption( "-T" );
verifier.addCliOption( "1" );
verifier.executeGoal( "package" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
}
@@ -99,14 +95,12 @@ public class MavenITmng5578SessionScopeTest
// install the test plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
// build the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.addCliOption( "-Dit-build-extensions=true" );
verifier.executeGoal( "package" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
}
@@ -124,13 +118,11 @@ public class MavenITmng5578SessionScopeTest
// install the test extension
verifier = newVerifier( extensionDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
// install the test plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
// build the test project
@@ -138,7 +130,6 @@ public class MavenITmng5578SessionScopeTest
verifier.addCliOption( "-Dmaven.ext.class.path=" + new File( extensionDir, "target/classes" ).getAbsolutePath() );
verifier.setForkJvm( true ); // verifier does not support custom realms in embedded mode
verifier.executeGoal( "package" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
index 3fa2b9ade..d8c4666c8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
@@ -57,14 +57,12 @@ public class MavenITmng5581LifecycleMappingDelegate
// install the test extension
verifier = newVerifier( extensionDir.getAbsolutePath() );
verifier.executeGoal( "install" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
// compile the test project
verifier = newVerifier( projectDir.getAbsolutePath() );
verifier.setLogFileName( "compile-log.txt" );
verifier.executeGoal( "compile" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
// run custom "test-only" build phase
@@ -74,7 +72,6 @@ public class MavenITmng5581LifecycleMappingDelegate
verifier.setForkJvm( true );
verifier.setMavenDebug( true );
verifier.executeGoal( "test-only" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
verifier.verifyTextInLog( "maven-surefire-plugin" );
verifyTextNotInLog( verifier, "maven-compiler-plugin" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java
index c187a073c..e7d3a6d14 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java
@@ -55,7 +55,6 @@ public class MavenITmng5591WorkspaceReader
// install the test extension
verifier = newVerifier( extensionDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
// compile the test project
@@ -63,7 +62,6 @@ public class MavenITmng5591WorkspaceReader
verifier.addCliOption( "-Dmaven.ext.class.path="
+ new File( extensionDir, "target/mng-5591-workspace-reader-extension-0.1.jar" ).getCanonicalPath() );
verifier.executeGoal( "compile" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java
index 43b1e5e8d..ca0498c36 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java
@@ -51,7 +51,6 @@ public class MavenITmng5608ProfileActivationWarningTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
// check expected profiles activated, just for sanity (or build should have failed, given other profiles)
assertFileExists( testDir, "target/exists-basedir" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java
index 99b7b2439..4b6794662 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java
@@ -54,7 +54,6 @@ public class MavenITmng5639ImportScopePomResolutionTest
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng5639", "b", "0.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java
index 033bfd880..cf1fb31ac 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java
@@ -58,7 +58,6 @@ public class MavenITmng5640LifecycleParticipantAfterSessionEnd
// install the test plugin
verifier = newVerifier( extensionDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
// build the test project
@@ -72,7 +71,6 @@ public class MavenITmng5640LifecycleParticipantAfterSessionEnd
{
// expected, as the build will fail due to always failing UT
}
- verifier.resetStreams();
verifier.verifyTextInLog("testApp(org.apache.maven.its.mng5640.FailingTest)");
verifier.verifyFilePresent( "target/afterProjectsRead.txt" );
@@ -100,7 +98,6 @@ public class MavenITmng5640LifecycleParticipantAfterSessionEnd
// install the test plugin
verifier = newVerifier( extensionDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
// build the test project
@@ -114,7 +111,6 @@ public class MavenITmng5640LifecycleParticipantAfterSessionEnd
{
// expected, as the build will fail due to always failing UT
}
- verifier.resetStreams();
verifier.verifyFilePresent( "target/afterProjectsRead.txt" );
// See https://issues.apache.org/jira/browse/MNG-5641
@@ -142,13 +138,11 @@ public class MavenITmng5640LifecycleParticipantAfterSessionEnd
// install the test plugin
verifier = newVerifier( extensionDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
// install the bad plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
// build the test project
@@ -162,7 +156,6 @@ public class MavenITmng5640LifecycleParticipantAfterSessionEnd
{
// expected, as the build will fail due to always failing UT
}
- verifier.resetStreams();
verifier.verifyFilePresent( "target/afterProjectsRead.txt" );
// See https://issues.apache.org/jira/browse/MNG-5641
@@ -190,13 +183,11 @@ public class MavenITmng5640LifecycleParticipantAfterSessionEnd
// install the test plugin
verifier = newVerifier( extensionDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
// install the bad plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
// build the test project
@@ -210,7 +201,6 @@ public class MavenITmng5640LifecycleParticipantAfterSessionEnd
{
// expected, as the build will fail due to always failing UT
}
- verifier.resetStreams();
verifier.verifyFilePresent( "target/afterProjectsRead.txt" );
// See https://issues.apache.org/jira/browse/MNG-5641
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java
index 460f3a1ef..97636d59a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java
@@ -60,7 +60,6 @@ public class MavenITmng5663NestedImportScopePomResolutionTest
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyArtifactPresent( "org.apache.maven.its.mng5663", "c", "0.1", "jar" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java
index 2a4c17635..81e2ab19c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java
@@ -67,7 +67,6 @@ public class MavenITmng5669ReadPomsOnce
verifier.addCliOption( "-U" );
verifier.addCliOption( "-Dmaven.experimental.buildconsumer=false" );
verifier.executeGoals( Arrays.asList( "verify" ) );
- verifier.resetStreams();
List<String> logTxt = verifier.loadLines( "log.txt", "utf-8" );
for ( String line : logTxt )
@@ -122,7 +121,6 @@ public class MavenITmng5669ReadPomsOnce
verifier.addCliOption( "-U" );
verifier.addCliOption( "-Dmaven.experimental.buildconsumer=true" );
verifier.executeGoals( Arrays.asList( "verify" ) );
- verifier.resetStreams();
List<String> logTxt = verifier.loadLines( "log-bc.txt", "utf-8" );
for ( String line : logTxt )
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java
index 30665e5e7..2e4ee9792 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java
@@ -68,7 +68,6 @@ public class MavenITmng5716ToolchainsTypeTest
verifier.addCliOption( "toolchains.xml" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier.verifyFilePresent( "target/toolchains.properties" );
Properties results = verifier.loadProperties( "target/toolchains.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java
index 87151770f..e214376cb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java
@@ -49,13 +49,11 @@ public class MavenITmng5742BuildExtensionClassloaderTest
// install the test plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
// build the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "validate" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "target/execution-success.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java
index 696c4fd4f..9d88b9d7d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java
@@ -49,7 +49,6 @@ public class MavenITmng5753CustomMojoExecutionConfiguratorTest
// install the test plugin
verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
File configurationFile = new File(projectDir, "configuration.txt");
@@ -58,7 +57,6 @@ public class MavenITmng5753CustomMojoExecutionConfiguratorTest
// build the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.executeGoal( "validate" );
- verifier.resetStreams();
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( configurationFile.getCanonicalPath() );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java
index c78182396..8833a7a41 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java
@@ -82,10 +82,6 @@ public class MavenITmng5760ResumeFeatureTest extends AbstractMavenIntegrationTes
verifier.verifyTextInLog( "mvn [args] -r" );
verifyTextNotInLog( verifier, "mvn [args] -rf :module-b" );
}
- finally
- {
- verifier.resetStreams();
- }
// New build with -r should resume the build from module-b, skipping module-a since it has succeeded already.
verifier = newVerifier( parentDependentTestDir.getAbsolutePath() );
@@ -94,7 +90,6 @@ public class MavenITmng5760ResumeFeatureTest extends AbstractMavenIntegrationTes
verifyTextNotInLog( verifier, "Building module-a 1.0" );
verifier.verifyTextInLog( "Building module-b 1.0" );
verifier.verifyTextInLog( "Building module-c 1.0" );
- verifier.resetStreams();
}
@Test
@@ -113,10 +108,6 @@ public class MavenITmng5760ResumeFeatureTest extends AbstractMavenIntegrationTes
{
// Expected to fail.
}
- finally
- {
- verifier.resetStreams();
- }
// Let module-b and module-c fail, if they would have been built...
verifier = newVerifier( parentDependentTestDir.getAbsolutePath() );
@@ -125,14 +116,8 @@ public class MavenITmng5760ResumeFeatureTest extends AbstractMavenIntegrationTes
// ... but adding -r should exclude those two from the build because the previous Maven invocation
// marked them as successfully built.
verifier.addCliOption( "-r" );
- try
- {
- verifier.executeGoal( "test" );
- }
- finally
- {
- verifier.resetStreams();
- }
+
+ verifier.executeGoal( "test" );
}
@Test
@@ -154,17 +139,12 @@ public class MavenITmng5760ResumeFeatureTest extends AbstractMavenIntegrationTes
{
verifier.verifyTextInLog( "mvn [args] -r" );
}
- finally
- {
- verifier.resetStreams();
- }
verifier = newVerifier( parentIndependentTestDir.getAbsolutePath() );
verifier.addCliOption( "-r" );
verifier.executeGoal( "test" );
verifier.verifyTextInLog( "Building module-a 1.0" );
verifyTextNotInLog( verifier, "Building module-b 1.0" );
- verifier.resetStreams();
}
@Test
@@ -182,10 +162,6 @@ public class MavenITmng5760ResumeFeatureTest extends AbstractMavenIntegrationTes
{
verifier.verifyTextInLog( "Goal requires a project to execute but there is no POM in this directory" );
}
- finally
- {
- verifier.resetStreams();
- }
}
@Test
@@ -215,10 +191,6 @@ public class MavenITmng5760ResumeFeatureTest extends AbstractMavenIntegrationTes
{
// Expected to fail.
}
- finally
- {
- verifier.resetStreams();
- }
// Let module-b fail, if it would have been built...
verifier = newVerifier( fourModulesTestDir.getAbsolutePath() );
@@ -231,14 +203,8 @@ public class MavenITmng5760ResumeFeatureTest extends AbstractMavenIntegrationTes
// a : success
// c : success
// d : success
- try
- {
- verifier.executeGoal( "verify" );
- }
- finally
- {
- verifier.resetStreams();
- }
+
+ verifier.executeGoal( "verify" );
}
@Test
@@ -267,10 +233,6 @@ public class MavenITmng5760ResumeFeatureTest extends AbstractMavenIntegrationTes
{
// Expected to fail.
}
- finally
- {
- verifier.resetStreams();
- }
// Let module-a and module-b fail, if they would have been built...
verifier = newVerifier( fourModulesTestDir.getAbsolutePath() );
@@ -280,17 +242,11 @@ public class MavenITmng5760ResumeFeatureTest extends AbstractMavenIntegrationTes
// ... but adding -r should exclude those two from the build because the previous Maven invocation
// marked them as successfully built.
verifier.addCliOption( "-r" );
- try
- {
- // The result should be:
- // c : success
- // d : success
- verifier.executeGoal( "verify" );
- }
- finally
- {
- verifier.resetStreams();
- }
+
+ // The result should be:
+ // c : success
+ // d : success
+ verifier.executeGoal( "verify" );
}
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java
index 3d2681fff..d67c27d63 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java
@@ -45,7 +45,6 @@ public class MavenITmng5768CliExecutionIdTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-configuration:config@test-execution-id" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "target/config.properties" );
assertEquals( "CONFIGURED", props.getProperty( "beanParam.fieldParam" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
index ad77b4117..4caca1f8a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
@@ -37,7 +37,6 @@ public class MavenITmng5771CoreExtensionsTest
verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
@Test
@@ -56,7 +55,6 @@ public class MavenITmng5771CoreExtensionsTest
verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
//
@@ -100,7 +98,6 @@ public class MavenITmng5771CoreExtensionsTest
verifier.addCliOption( new File( testDir, "settings.xml" ).getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
server.stop();
}
@@ -127,7 +124,6 @@ public class MavenITmng5771CoreExtensionsTest
verifier.addCliOption( "-Dtest-extension-version=0.1" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
//
@@ -152,6 +148,5 @@ public class MavenITmng5771CoreExtensionsTest
verifier.setForkJvm( true ); // force forked JVM since we need the shell script to detect .mvn/
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java
index 70fde8868..18c3e92c4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java
@@ -39,7 +39,6 @@ public class MavenITmng5774ConfigurationProcessorsTest
verifier.verifyFilePresent( "target/classes/result.properties" );
Properties result = verifier.loadProperties( "target/classes/result.properties" );
assertEquals( "yes", result.getProperty( "configurationProcessorContributedValue" ) );
- verifier.resetStreams();
}
@Test
@@ -65,6 +64,5 @@ public class MavenITmng5774ConfigurationProcessorsTest
{
verifier.verifyTextInLog( "There can only be one user supplied ConfigurationProcessor" );
}
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java
index d649bfa36..eaf41f446 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java
@@ -25,12 +25,10 @@ public class MavenITmng5783PluginDependencyFiltering
Verifier verifier = newVerifier( new File( testDir, "plugin" ).getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( new File( testDir, "slf4j" ).getAbsolutePath(), "remote" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
// Note that plugin dependencies always include plugin itself and plexus-utils
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java
index b113c7f98..5abf66d8e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java
@@ -29,6 +29,5 @@ public class MavenITmng5805PkgTypeMojoConfiguration2
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.verifyTextInLog( "CLASS_NAME=org.apache.maven.its.mng5805.TestClass1" );
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java
index c97ab330f..020354d52 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java
@@ -24,12 +24,10 @@ public class MavenITmng5840ParentVersionRanges
Verifier verifier = newVerifier( new File( testDir, "parent-1" ).getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( new File( testDir, "child" ).getAbsolutePath(), "remote" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
@Test
@@ -41,12 +39,10 @@ public class MavenITmng5840ParentVersionRanges
Verifier verifier = newVerifier( new File( testDir, "parent-1" ).getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( new File( testDir, "child" ).getAbsolutePath(), "remote" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java
index f246b70b8..aef2c8943 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java
@@ -24,11 +24,9 @@ public class MavenITmng5840RelativePathReactorMatching
Verifier verifier = newVerifier( new File( testDir, "parent-1" ).getAbsolutePath(), "remote" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( new File( testDir, "child" ).getAbsolutePath(), "remote" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java
index d9b0fa54d..ba8192dc5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java
@@ -135,7 +135,6 @@ public class MavenITmng5868NoDuplicateAttachedArtifacts
verifier.displayStreamBuffers();
verifier.executeGoals( Arrays.asList("org.apache.maven.its.plugins:maven-it-plugin-artifact:2.1-SNAPSHOT:attach", "deploy" ) );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
assertEquals("deployedJarArtifactNumber: " + deployedJarArtifactNumber, 1, deployedJarArtifactNumber );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java
index d50234468..f05b1423e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java
@@ -115,7 +115,6 @@ public class MavenITmng5889FindBasedir
verifier.setForkJvm( true ); // force forked JVM since we need the shell script to detect .mvn/ location
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
Properties props = verifier.loadProperties( "expression.properties" );
assertEquals( "ok", props.getProperty( "project.properties.jvm-config" ) );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java
index 8ec2ad76e..55a0e4035 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java
@@ -69,7 +69,6 @@ public class MavenITmng5895CIFriendlyUsageWithPropertyTest
verifier.executeGoal( "clean" );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
@@ -89,7 +88,6 @@ public class MavenITmng5895CIFriendlyUsageWithPropertyTest
verifier.executeGoal( "clean" );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java
index 5724cb4fc..2ce7f6316 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java
@@ -55,7 +55,6 @@ public class MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "test" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java
index c5ab70765..0eaa349aa 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java
@@ -51,7 +51,6 @@ public class MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> dependencies = verifier.loadLines( "target/dependencies.txt", "UTF-8" );
assertEquals( 5, dependencies.size() );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java
index d593580a1..9615cd4db 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java
@@ -27,7 +27,6 @@ public class MavenITmng5958LifecyclePhaseBinaryCompat
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.verifyTextInLog( "CLASS_NAME=java.lang.String" );
- verifier.resetStreams();
}
@Test
@@ -48,6 +47,5 @@ public class MavenITmng5958LifecyclePhaseBinaryCompat
verifier.verifyTextInLog( "[ERROR] Internal error: java.lang.ClassCastException: " );
verifier.verifyTextInLog( "org.apache.maven.lifecycle.mapping.LifecyclePhase cannot be cast to " );
}
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java
index e9ba2fcc6..43b34f53e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java
@@ -40,7 +40,6 @@ public class MavenITmng5965ParallelBuildMultipliesWorkTest
// include an aggregator task so that the two goals end up in different task segments
verifier.executeGoals( Arrays.asList( "clean", "install:help" ) );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> logLines = verifier.loadLines( "log-only.txt", "UTF-8" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java
index 7831edb78..dcb8194b5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java
@@ -65,7 +65,6 @@ public class MavenITmng6057CheckReactorOrderTest
verifier.addCliOption( "-Drevision=1.3.0-SNAPSHOT" );
verifier.executeGoal( "clean" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
List<String> loadedLines = verifier.loadLines( "log-only.txt", "UTF-8" );
List<String> resultingLines = extractReactorBuildOrder( loadedLines );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java
index a0df79d0e..ed2107d85 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java
@@ -36,6 +36,5 @@ public class MavenITmng6071GetResourceWithCustomPom
verifier.setForkJvm( true );
verifier.executeGoal( "verify" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java
index 2f7aeff8a..71da101a6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java
@@ -61,7 +61,6 @@ public class MavenITmng6084Jsr250PluginTest
v0.deleteArtifacts( "org.apache.maven.its.mng6084" );
v0.executeGoal( "install" );
v0.verifyErrorFreeLog();
- v0.resetStreams();
//
// Execute the JSR 250 plugin
@@ -70,7 +69,6 @@ public class MavenITmng6084Jsr250PluginTest
v1.setAutoclean( false );
v1.executeGoal( "org.apache.maven.its.mng6084:jsr250-maven-plugin:0.0.1-SNAPSHOT:hello" );
v1.verifyErrorFreeLog();
- v1.resetStreams();
v1.verifyTextInLog( "Hello! I am a component using JSR 250 with @PostConstruct support" );
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java
index 60d6956e5..03da7f41d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java
@@ -69,7 +69,6 @@ public class MavenITmng6090CIFriendlyTest
verifier.setLogFileName( "install-log.txt" );
verifier.executeGoals( Arrays.asList( "clean", "install" ) );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
verifier = newVerifier( testDir.getAbsolutePath(), false );
verifier.setMavenDebug( false );
@@ -80,7 +79,6 @@ public class MavenITmng6090CIFriendlyTest
verifier.addCliOption( "module-3" );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
}
@Test
@@ -99,7 +97,6 @@ public class MavenITmng6090CIFriendlyTest
verifier.setLogFileName( "install-log.txt" );
verifier.executeGoals( Arrays.asList( "clean", "install" ) );
verifier.verifyErrorFreeLog();
... 561 lines suppressed ...