You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2022/01/16 16:51:54 UTC

[maven-integration-testing] branch master updated: fix javadoc issues for JDK 8

This is an automated email from the ASF dual-hosted git repository.

hboutemy 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 7fb5660  fix javadoc issues for JDK 8
7fb5660 is described below

commit 7fb56604e6e74afe293a42e82f20665566f10ba8
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Jan 16 17:51:45 2022 +0100

    fix javadoc issues for JDK 8
---
 .../maven/it/MavenIT0008SimplePluginTest.java      |  3 ++-
 .../maven/it/MavenIT0009GoalConfigurationTest.java |  3 ++-
 ...MavenIT0010DependencyClosureResolutionTest.java |  3 ++-
 ...11DefaultVersionByDependencyManagementTest.java |  3 ++-
 .../maven/it/MavenIT0012PomInterpolationTest.java  |  3 ++-
 .../it/MavenIT0018DependencyManagementTest.java    |  3 ++-
 ...MavenIT0019PluginVersionMngtBySuperPomTest.java |  3 ++-
 .../apache/maven/it/MavenIT0021PomProfileTest.java |  3 ++-
 .../maven/it/MavenIT0023SettingsProfileTest.java   |  3 ++-
 .../it/MavenIT0024MultipleGoalExecutionsTest.java  |  3 ++-
 ...venIT0025MultipleExecutionLevelConfigsTest.java |  3 ++-
 .../MavenIT0030DepPomDepMngtInheritanceTest.java   |  3 ++-
 .../maven/it/MavenIT0032MavenPrerequisiteTest.java |  3 ++-
 .../apache/maven/it/MavenIT0036ReleasePomTest.java |  3 ++-
 .../it/MavenIT0037AlternatePomFileSameDirTest.java |  3 ++-
 ...avenIT0038AlternatePomFileDifferentDirTest.java |  3 ++-
 .../it/MavenIT0039ReleasePomInReactorTest.java     |  3 ++-
 ...avenIT0040PackagingFromPluginExtensionTest.java |  3 ++-
 ...nIT0041ArtifactTypeFromPluginExtensionTest.java |  3 ++-
 .../maven/it/MavenIT0051ReleaseProfileTest.java    |  3 ++-
 .../maven/it/MavenIT0052ReleaseProfileTest.java    |  3 ++-
 .../it/MavenIT0056MultipleGoalExecutionsTest.java  |  3 ++-
 .../it/MavenIT0063SystemScopeDependencyTest.java   |  3 ++-
 .../it/MavenIT0064MojoConfigViaSettersTest.java    |  3 ++-
 ...enIT0071PluginConfigWithDottedPropertyTest.java |  3 ++-
 ...nIT0072InterpolationWithDottedPropertyTest.java |  3 ++-
 .../it/MavenIT0085TransitiveSystemScopeTest.java   |  3 ++-
 .../maven/it/MavenIT0086PluginRealmTest.java       |  3 ++-
 ...nIT0087PluginRealmWithProjectLevelDepsTest.java |  3 ++-
 .../it/MavenIT0090EnvVarInterpolationTest.java     |  2 ++
 ...ServerAuthzAvailableToWagonMgrInPluginTest.java |  3 ++-
 .../maven/it/MavenIT0130CleanLifecycleTest.java    |  3 ++-
 .../maven/it/MavenIT0131SiteLifecycleTest.java     |  3 ++-
 .../maven/it/MavenIT0132PomLifecycleTest.java      |  3 ++-
 .../maven/it/MavenIT0133JarLifecycleTest.java      |  3 ++-
 .../maven/it/MavenIT0134WarLifecycleTest.java      |  3 ++-
 .../maven/it/MavenIT0135EjbLifecycleTest.java      |  3 ++-
 .../maven/it/MavenIT0136RarLifecycleTest.java      |  3 ++-
 .../maven/it/MavenIT0137EarLifecycleTest.java      |  3 ++-
 .../maven/it/MavenIT0138PluginLifecycleTest.java   |  3 ++-
 ...enIT0139InterpolationWithProjectPrefixTest.java |  3 ++-
 .../MavenIT0140InterpolationWithPomPrefixTest.java |  3 ++-
 .../it/MavenIT0142DirectDependencyScopesTest.java  |  3 ++-
 .../MavenIT0143TransitiveDependencyScopesTest.java |  9 +++++++-
 .../it/MavenIT0144LifecycleExecutionOrderTest.java |  2 ++
 ...MavenIT0145ReactorWithIncludesExcludesTest.java |  7 +++++-
 .../org/apache/maven/it/MavenITBootstrapTest.java  |  3 ++-
 .../MavenITmng0095ReactorFailureBehaviorTest.java  | 11 ++++++---
 .../it/MavenITmng0187CollectedProjectsTest.java    |  2 ++
 .../MavenITmng0249ResolveDepsFromReactorTest.java  |  3 ++-
 ...82NonReactorExecWhenProjectIndependentTest.java |  3 ++-
 ...venITmng0294MergeGlobalAndUserSettingsTest.java |  3 ++-
 .../MavenITmng0377PluginLookupFromPrefixTest.java  |  3 ++-
 .../MavenITmng0449PluginVersionResolutionTest.java |  5 +++-
 ...nITmng0461TolerateMissingDependencyPomTest.java |  3 ++-
 .../maven/it/MavenITmng0469ReportConfigTest.java   | 12 +++++++---
 .../it/MavenITmng0471CustomLifecycleTest.java      |  3 ++-
 .../it/MavenITmng0479OverrideCentralRepoTest.java  |  5 +++-
 ...ITmng0496IgnoreUnknownPluginParametersTest.java |  3 ++-
 .../maven/it/MavenITmng0505VersionRangeTest.java   |  3 ++-
 .../it/MavenITmng0507ArtifactRelocationTest.java   |  3 ++-
 ...avenITmng0522InheritedPluginMgmtConfigTest.java |  3 ++-
 .../MavenITmng0553SettingsAuthzEncryptionTest.java |  6 +++++
 .../MavenITmng0557UserSettingsCliOptionTest.java   |  3 ++-
 .../MavenITmng0612NewestConflictResolverTest.java  |  3 ++-
 .../it/MavenITmng0666IgnoreLegacyPomTest.java      |  3 ++-
 .../it/MavenITmng0674PluginParameterAliasTest.java |  5 +++-
 .../maven/it/MavenITmng0680ParentBasedirTest.java  |  3 ++-
 .../it/MavenITmng0731LegacyRepoLayoutTest.java     |  3 ++-
 .../MavenITmng0761MissingSnapshotDistRepoTest.java |  3 ++-
 .../maven/it/MavenITmng0768OfflineModeTest.java    |  2 ++
 ...mng0773SettingsProfileReactorPollutionTest.java |  3 ++-
 ...MavenITmng0781PluginConfigVsExecConfigTest.java |  3 ++-
 .../it/MavenITmng0786ProfileAwareReactorTest.java  |  3 ++-
 ...avenITmng0814ExplicitProfileActivationTest.java |  3 ++-
 .../it/MavenITmng0818WarDepsNotTransitiveTest.java |  3 ++-
 .../it/MavenITmng0820ConflictResolutionTest.java   |  3 ++-
 .../it/MavenITmng0823MojoContextPassingTest.java   |  3 ++-
 .../MavenITmng0836PluginParentResolutionTest.java  |  4 ++--
 ...mng0848SystemPropOverridesDefaultValueTest.java |  3 ++-
 .../it/MavenITmng0866EvaluateDefaultValueTest.java |  3 ++-
 ...enITmng0870ReactorAwarePluginDiscoveryTest.java |  3 ++-
 .../it/MavenITmng0947OptionalDependencyTest.java   |  3 ++-
 ...onentInjectionViaProjectLevelPluginDepTest.java |  3 ++-
 ...venITmng0985NonExecutedPluginMngtGoalsTest.java |  3 ++-
 ...venITmng1021EqualAttachmentBuildNumberTest.java |  2 ++
 .../it/MavenITmng1052PluginMngtConfigTest.java     |  3 ++-
 .../MavenITmng1073AggregatorForksReactorTest.java  |  5 +++-
 .../MavenITmng1088ReactorPluginResolutionTest.java |  3 ++-
 ...MavenITmng1142VersionRangeIntersectionTest.java |  5 +++-
 .../it/MavenITmng1144MultipleDefaultGoalsTest.java |  3 ++-
 .../MavenITmng1233WarDepWithProvidedScopeTest.java |  3 ++-
 .../it/MavenITmng1323AntrunDependenciesTest.java   |  3 ++-
 .../it/MavenITmng1349ChecksumFormatsTest.java      |  3 ++-
 .../it/MavenITmng1412DependenciesOrderTest.java    |  1 -
 .../MavenITmng1415QuotedSystemPropertiesTest.java  |  3 ++-
 ...venITmng1491ReactorArtifactIdCollisionTest.java |  2 --
 ...avenITmng1493NonStandardModulePomNamesTest.java |  3 ---
 .../it/MavenITmng1701DuplicatePluginTest.java      |  2 ++
 ...MavenITmng1703PluginMgmtDepInheritanceTest.java |  3 ++-
 ...51ForcedMetadataUpdateDuringDeploymentTest.java |  2 ++
 ...03PomValidationErrorIncludesLineNumberTest.java |  2 ++
 .../maven/it/MavenITmng1830ShowVersionTest.java    |  2 ++
 .../MavenITmng1895ScopeConflictResolutionTest.java | 15 +++++++++++-
 .../it/MavenITmng1908LegacySnapshotUpdateTest.java |  3 ++-
 ...ITmng1957JdkActivationWithVersionRangeTest.java |  3 ++-
 ...venITmng1992SystemPropOverridesPomPropTest.java |  3 ++-
 ...mng1995InterpolateBooleanModelElementsTest.java |  3 ++-
 ...avenITmng1999DefaultReportsInheritanceTest.java |  5 +++-
 ...nITmng2006ChildPathAwareUrlInheritanceTest.java |  3 ++-
 ...2045testJarDependenciesBrokenInReactorTest.java |  1 -
 ...terpolateWithSettingsProfilePropertiesTest.java |  3 ++-
 ...venITmng2054PluginExecutionInheritanceTest.java |  3 ++-
 .../MavenITmng2068ReactorRelativeParentsTest.java  |  7 +++++-
 ...2098VersionRangeSatisfiedFromWrongRepoTest.java |  3 ++-
 ...venITmng2103PluginExecutionInheritanceTest.java |  3 ++-
 .../MavenITmng2123VersionRangeDependencyTest.java  |  1 -
 ...ng2124PomInterpolationWithParentValuesTest.java |  3 ++-
 ...nITmng2130ParentLookupFromReactorCacheTest.java |  3 ++-
 .../it/MavenITmng2135PluginBuildInReactorTest.java |  3 ++-
 .../MavenITmng2136ActiveByDefaultProfileTest.java  |  3 ++-
 ...g2140ReactorAwareDepResolutionWhenForkTest.java |  3 ++-
 ...ng2174PluginDepsManagedByParentProfileTest.java |  3 ++-
 .../it/MavenITmng2196ParentResolutionTest.java     |  4 ++--
 ...avenITmng2201PluginConfigInterpolationTest.java |  3 ++-
 ...ng2222OutputDirectoryReactorResolutionTest.java |  3 ++-
 .../it/MavenITmng2228ComponentInjectionTest.java   |  3 ++-
 ...venITmng2234ActiveProfilesFromSettingsTest.java |  3 ++-
 .../maven/it/MavenITmng2254PomEncodingTest.java    |  3 ++-
 ...276ProfileActivationBySettingsPropertyTest.java |  5 +++-
 ...Tmng2277AggregatorAndResolutionPluginsTest.java |  1 -
 .../MavenITmng2293CustomPluginParamImplTest.java   |  3 ++-
 .../it/MavenITmng2305MultipleProxiesTest.java      |  2 ++
 .../MavenITmng2309ProfileInjectionOrderTest.java   |  2 ++
 .../MavenITmng2318LocalParentResolutionTest.java   |  3 ++-
 .../MavenITmng2339BadProjectInterpolationTest.java |  1 -
 .../it/MavenITmng2362DeployedPomEncodingTest.java  |  2 ++
 ...avenITmng2363BasedirAwareFileActivatorTest.java |  3 ++-
 .../maven/it/MavenITmng2387InactiveProxyTest.java  |  2 ++
 .../it/MavenITmng2432PluginPrefixOrderTest.java    |  3 ++-
 ...estampedDependencyVersionInterpolationTest.java |  3 ++-
 ...9PluginDependenciesComeFromPluginReposTest.java |  3 ++-
 .../maven/it/MavenITmng2562Timestamp322Test.java   |  3 ---
 .../maven/it/MavenITmng2562TimestampTest.java      |  1 -
 .../it/MavenITmng2576MakeLikeReactorTest.java      | 19 ++++++++++++++-
 ...MavenITmng2577SettingsXmlInterpolationTest.java |  5 +++-
 ...venITmng2591MergeInheritedPluginConfigTest.java |  5 +++-
 .../MavenITmng2605BogusProfileActivationTest.java  |  3 ++-
 ...mng2668UsePluginDependenciesForSortingTest.java |  1 -
 .../it/MavenITmng2693SitePluginRealmTest.java      |  3 ++-
 .../MavenITmng2695OfflinePluginSnapshotsTest.java  |  3 ++-
 ...Tmng2738ProfileIdCollidesWithCliOptionTest.java |  3 ++-
 ...venITmng2739RequiredRepositoryElementsTest.java |  2 +-
 ...41PluginMetadataResolutionErrorMessageTest.java |  5 +++-
 .../it/MavenITmng2744checksumVerificationTest.java |  3 ++-
 ...venITmng2749ExtensionAvailableToPluginTest.java |  3 ++-
 ...ITmng2771PomExtensionComponentOverrideTest.java |  3 ++-
 .../it/MavenITmng2790LastUpdatedMetadataTest.java  |  2 ++
 .../maven/it/MavenITmng2820PomCommentsTest.java    |  2 ++
 ...ustomArtifactHandlerAndCustomLifecycleTest.java |  3 ++-
 ...mng2843PluginConfigPropertiesInjectionTest.java |  3 ++-
 ...ProfileActivationByEnvironmentVariableTest.java |  3 ++-
 .../it/MavenITmng2861RelocationsAndRangesTest.java |  1 -
 .../maven/it/MavenITmng2865MirrorWildcardTest.java |  9 +++++++-
 ...mng2871PrePackageSubartifactResolutionTest.java |  3 ++-
 .../MavenITmng2878DefaultReportXmlImportTest.java  |  3 ++-
 .../it/MavenITmng2892HideCorePlexusUtilsTest.java  |  3 ++-
 .../MavenITmng2921ActiveAttachedArtifactsTest.java |  3 ++-
 .../it/MavenITmng2926PluginPrefixOrderTest.java    |  3 ++-
 ...MavenITmng2972OverridePluginDependencyTest.java |  5 +++-
 .../MavenITmng2994SnapshotRangeRepositoryTest.java |  3 ++-
 ...004ReactorFailureBehaviorMultithreadedTest.java | 17 ++++++++++----
 .../it/MavenITmng3012CoreClassImportTest.java      |  3 ++-
 ...enITmng3023ReactorDependencyResolutionTest.java |  6 +++++
 .../MavenITmng3038TransitiveDepManVersionTest.java |  2 --
 ...enITmng3043BestEffortReactorResolutionTest.java |  5 +++-
 ...venITmng3057VersionExprTransformationsTest.java |  2 +-
 ...g3092SnapshotsExcludedFromVersionRangeTest.java |  3 ++-
 ...avenITmng3099SettingsProfilesWithNoPomTest.java |  3 ++-
 ...avenITmng3106ProfileMultipleActivatorsTest.java |  2 +-
 .../it/MavenITmng3118TestClassPathOrderTest.java   |  3 ++-
 ...venITmng3122ActiveProfilesNoDuplicatesTest.java |  3 ++-
 ...UrlNormalizationNotBeforeInterpolationTest.java |  5 ++--
 ...3139UseCachedMetadataOfBlacklistedRepoTest.java |  3 ++-
 .../maven/it/MavenITmng3183LoggingToFileTest.java  |  3 ++-
 .../MavenITmng3203DefaultLifecycleExecIdTest.java  |  4 +---
 ...venITmng3208ProfileAwareReactorSortingTest.java |  3 ++-
 .../MavenITmng3217InterPluginDependencyTest.java   |  3 ++-
 .../it/MavenITmng3221InfiniteForkingTest.java      |  1 -
 ...ITmng3259DepsDroppedInMultiModuleBuildTest.java |  1 -
 ...venITmng3268MultipleHyphenPCommandLineTest.java |  1 -
 ...avenITmng3271DefaultReportsSuppressionTest.java |  3 ++-
 .../it/MavenITmng3284UsingCachedPluginsTest.java   |  3 ++-
 .../maven/it/MavenITmng3288SystemScopeDirTest.java |  2 ++
 ...enITmng3297DependenciesNotLeakedToMojoTest.java |  3 ++-
 .../it/MavenITmng3314OfflineSnapshotsTest.java     |  3 ++-
 .../MavenITmng3331ModulePathNormalizationTest.java |  1 -
 ...enITmng3355TranslatedPathInterpolationTest.java |  1 -
 ...avenITmng3372DirectInvocationOfPluginsTest.java |  1 -
 ...avenITmng3379ParallelArtifactDownloadsTest.java |  2 ++
 ...avenITmng3380ManagedRelocatedTransdepsTest.java |  3 ++-
 ...avenITmng3394POMPluginVersionDominanceTest.java |  1 -
 ...encyManagementForOverConstrainedRangesTest.java |  1 -
 .../it/MavenITmng3401CLIDefaultExecIdTest.java     |  4 ++++
 .../MavenITmng3415JunkRepositoryMetadataTest.java  | 14 ++++++-----
 ...avenITmng3422ActiveComponentCollectionTest.java |  3 ++-
 ...428PluginDescriptorArtifactsIncompleteTest.java |  1 -
 .../maven/it/MavenITmng3461MirrorMatchingTest.java |  6 +++++
 ...rictCheckumVerificationOfDependencyPomTest.java |  3 ++-
 .../maven/it/MavenITmng3475BaseAlignedDirTest.java |  3 ++-
 ...ng3477DependencyResolutionErrorMessageTest.java |  5 ++--
 ...venITmng3482DependencyPomInterpolationTest.java |  1 -
 .../MavenITmng3485OverrideWagonExtensionTest.java  |  1 -
 .../it/MavenITmng3498ForkToOtherMojoTest.java      |  3 +--
 .../maven/it/MavenITmng3529QuotedCliArgTest.java   |  3 ++-
 .../MavenITmng3530DynamicPOMInterpolationTest.java |  1 -
 ...avenITmng3535SelfReferentialPropertiesTest.java |  1 -
 .../MavenITmng3536AppendedAbsolutePathsTest.java   |  1 -
 .../it/MavenITmng3545ProfileDeactivationTest.java  |  6 ++++-
 ...5HexadecimalOctalPluginParameterConfigTest.java |  3 ++-
 ...avenITmng3581PluginUsesWagonDependencyTest.java |  3 ++-
 ...enITmng3586SystemScopePluginDependencyTest.java |  5 +++-
 ...MavenITmng3599useHttpProxyForWebDAVMk2Test.java |  2 ++
 .../MavenITmng3599useHttpProxyForWebDAVTest.java   |  2 ++
 .../MavenITmng3600DeploymentModeDefaultsTest.java  |  1 -
 ...MavenITmng3607ClassLoadersUseValidUrlsTest.java |  3 ++-
 .../it/MavenITmng3621UNCInheritedPathsTest.java    |  3 ++-
 .../it/MavenITmng3642DynamicResourcesTest.java     |  3 +--
 .../maven/it/MavenITmng3645POMSyntaxErrorTest.java |  6 ++---
 .../it/MavenITmng3652UserAgentHeaderTest.java      |  4 ++--
 ...nITmng3667ResolveDepsWithBadPomVersionTest.java |  3 ++-
 ...enITmng3671PluginLevelDepInterpolationTest.java |  1 -
 ...avenITmng3679PluginExecIdInterpolationTest.java |  1 -
 .../it/MavenITmng3680InvalidDependencyPOMTest.java |  3 ++-
 .../it/MavenITmng3684BuildPluginParameterTest.java |  1 -
 .../MavenITmng3694ReactorProjectsDynamismTest.java |  1 -
 .../it/MavenITmng3701ImplicitProfileIdTest.java    |  3 ++-
 ...g3703ExecutionProjectWithRelativePathsTest.java |  4 ++--
 ...MavenITmng3704LifecycleExecutorWrapperTest.java |  3 +--
 .../MavenITmng3710PollutedClonedPluginsTest.java   |  4 +++-
 .../it/MavenITmng3714ToolchainsCliOptionTest.java  |  3 ++-
 .../it/MavenITmng3716AggregatorForkingTest.java    |  5 ++--
 .../it/MavenITmng3719PomExecutionOrderingTest.java |  2 ++
 .../MavenITmng3723ConcreteParentProjectTest.java   |  1 -
 .../it/MavenITmng3724ExecutionProjectSyncTest.java |  3 +--
 .../it/MavenITmng3729MultiForkAggregatorsTest.java |  5 ++--
 .../maven/it/MavenITmng3732ActiveProfilesTest.java |  3 ++-
 ...Tmng3740SelfReferentialReactorProjectsTest.java |  1 -
 ...MavenITmng3743ForkWithPluginManagementTest.java |  3 +--
 .../it/MavenITmng3746POMPropertyOverrideTest.java  |  4 ++--
 .../MavenITmng3747PrefixedPathExpressionTest.java  |  3 +--
 .../maven/it/MavenITmng3748BadSettingsXmlTest.java |  2 --
 .../it/MavenITmng3760BaseUriPropertyTest.java      |  1 -
 .../MavenITmng3766ToolchainsFromExtensionTest.java |  3 ++-
 ...enITmng3769ExclusionRelocatedTransdepsTest.java |  3 ++-
 ...Tmng3775ConflictResolutionBacktrackingTest.java |  1 -
 ...MavenITmng3796ClassImportInconsistencyTest.java |  3 ++-
 ...venITmng3805ExtensionClassPathOrderingTest.java |  3 ++-
 ...ng3807PluginConfigExpressionEvaluationTest.java |  2 ++
 ...avenITmng3808ReportInheritenceOrderingTest.java |  2 ++
 .../it/MavenITmng3810BadProfileActivationTest.java |  1 -
 ...eportingPluginConfigurationInheritanceTest.java |  3 ++-
 .../MavenITmng3813PluginClassPathOrderingTest.java |  3 ++-
 .../it/MavenITmng3814BogusProjectCycleTest.java    |  3 ++-
 .../it/MavenITmng3819PluginDepPlexusUtilsTest.java |  3 ++-
 .../it/MavenITmng3821EqualPluginExecIdsTest.java   |  3 ++-
 ...enITmng3822BasedirAlignedInterpolationTest.java |  3 ++-
 .../maven/it/MavenITmng3827PluginConfigTest.java   |  3 ++-
 .../it/MavenITmng3831PomInterpolationTest.java     |  3 ++-
 ...ITmng3833PomInterpolationDataFlowChainTest.java |  3 ++-
 .../MavenITmng3836PluginConfigInheritanceTest.java |  3 ++-
 .../it/MavenITmng3838EqualPluginDepsTest.java      |  3 ++-
 .../MavenITmng3839PomParsingCoalesceTextTest.java  |  3 ++-
 .../maven/it/MavenITmng3843PomInheritanceTest.java |  2 ++
 .../MavenITmng3845LimitedPomInheritanceTest.java   |  3 ++-
 ...enITmng3846PomInheritanceUrlAdjustmentTest.java |  5 +++-
 ...g3852PluginConfigWithHeterogeneousListTest.java |  3 ++-
 ...MavenITmng3853ProfileInjectedDistReposTest.java |  3 ++-
 .../it/MavenITmng3863AutoPluginGroupIdTest.java    |  4 ++--
 .../it/MavenITmng3864PerExecPluginConfigTest.java  |  3 ++-
 .../MavenITmng3866PluginConfigInheritanceTest.java |  3 ++-
 ...mng3872ProfileActivationInRelocatedPomTest.java |  3 ++-
 .../MavenITmng3873MultipleExecutionGoalsTest.java  |  9 +++++---
 .../it/MavenITmng3877BasedirAlignedModelTest.java  |  3 ++-
 ...Tmng3885UniqueVersionFromParentProfileTest.java |  9 +++++++-
 .../it/MavenITmng3886ExecutionGoalsOrderTest.java  |  9 +++++---
 .../it/MavenITmng3887PluginExecutionOrderTest.java |  9 +++++---
 ...mng3890TransitiveDependencyScopeUpdateTest.java |  3 ++-
 .../it/MavenITmng3892ReleaseDeploymentTest.java    |  2 ++
 .../it/MavenITmng3899ExtensionInheritanceTest.java |  3 ++-
 ...Tmng3900ProfilePropertiesInterpolationTest.java |  3 ++-
 ...enITmng3904NestedBuildDirInterpolationTest.java |  3 ++-
 ...ITmng3906MergedPluginClassPathOrderingTest.java |  3 ++-
 ...venITmng3916PluginExecutionInheritanceTest.java |  3 ++-
 .../MavenITmng3924XmlMarkupInterpolationTest.java  |  3 ++-
 ...venITmng3925MergedPluginExecutionOrderTest.java |  9 +++++---
 ...nITmng3927PluginDefaultExecutionConfigTest.java |  3 ++-
 .../MavenITmng3933ProfilesXmlActivationTest.java   |  2 ++
 ...venITmng3937MergedPluginExecutionGoalsTest.java |  9 +++++---
 .../MavenITmng3938MergePluginExecutionsTest.java   |  9 +++++---
 .../it/MavenITmng3940EnvVarInterpolationTest.java  |  2 ++
 ...xecutionProjectRestrictedToForkingMojoTest.java |  3 ++-
 ...venITmng3943PluginExecutionInheritanceTest.java |  3 ++-
 .../it/MavenITmng3944BasedirInterpolationTest.java |  2 ++
 ...nITmng3947PluginDefaultExecutionConfigTest.java |  3 ++-
 ...ng3948ParentResolutionFromProfileReposTest.java |  5 +++-
 .../maven/it/MavenITmng3951AbsolutePathsTest.java  |  2 ++
 .../MavenITmng3953AuthenticatedDeploymentTest.java |  4 ++++
 .../it/MavenITmng3955EffectiveSettingsTest.java    |  3 ++-
 ...ITmng3970DepResolutionFromProfileReposTest.java |  7 +++++-
 .../maven/it/MavenITmng3974MirrorOrderingTest.java |  3 ++-
 .../maven/it/MavenITmng3979ElementJoinTest.java    |  3 ++-
 ...ng3983PluginResolutionFromProfileReposTest.java |  7 +++++-
 .../it/MavenITmng3991ValidDependencyScopeTest.java |  3 ++-
 .../MavenITmng3998PluginExecutionConfigTest.java   |  3 ++-
 .../MavenITmng4000MultiPluginExecutionsTest.java   |  9 +++++---
 .../it/MavenITmng4005UniqueDependencyKeyTest.java  |  9 +++++++-
 .../MavenITmng4007PlatformFileSeparatorTest.java   |  3 ++-
 .../it/MavenITmng4008MergedFilterOrderTest.java    |  3 ++-
 .../MavenITmng4009InheritProfileEffectsTest.java   |  3 ++-
 ...ITmng4016PrefixedPropertyInterpolationTest.java |  3 ++-
 ...ITmng4022IdempotentPluginConfigMergingTest.java |  3 ++-
 ...ITmng4023ParentProfileOneTimeInjectionTest.java |  3 ++-
 ...MavenITmng4026ReactorDependenciesOrderTest.java |  3 ++-
 ...MavenITmng4034ManagedProfileDependencyTest.java |  3 ++-
 ...ng4036ParentResolutionFromSettingsRepoTest.java |  5 +++-
 .../MavenITmng4040ProfileInjectedModulesTest.java  |  3 ++-
 ...ITmng4048VersionRangeReactorResolutionTest.java |  3 ++-
 .../MavenITmng4052ReactorAwareImportScopeTest.java |  2 ++
 .../MavenITmng4053PluginConfigAttributesTest.java  |  7 +++++-
 ...lassifierBasedDepResolutionFromReactorTest.java |  3 ++-
 .../it/MavenITmng4068AuthenticatedMirrorTest.java  |  2 ++
 .../it/MavenITmng4070WhitespaceTrimmingTest.java   |  3 ++-
 .../it/MavenITmng4072InactiveProfileReposTest.java |  3 ++-
 ...avenITmng4086ExplicitPluginMetaversionTest.java |  5 +++-
 .../MavenITmng4087PercentEncodedFileUrlTest.java   |  3 ++-
 ...Tmng4102InheritedPropertyInterpolationTest.java |  5 +++-
 ...ng4106InterpolationUsesDominantProfileTest.java |  3 ++-
 ...InterpolationUsesDominantProfileSourceTest.java |  3 ++-
 .../it/MavenITmng4112MavenVersionPropertyTest.java |  3 ++-
 .../maven/it/MavenITmng4116UndecodedUrlsTest.java  |  3 ++-
 .../it/MavenITmng4126ParentProfilesXmlTest.java    |  5 +++-
 ...venITmng4129PluginExecutionInheritanceTest.java |  3 ++-
 ...ng4148DepPomInterpWithSettingsProfilesTest.java |  2 ++
 .../maven/it/MavenITmng4150VersionRangeTest.java   |  3 ++-
 .../it/MavenITmng4162ReportingMigrationTest.java   |  3 ++-
 .../it/MavenITmng4166HideCoreCommonsCliTest.java   |  3 ++-
 .../it/MavenITmng4172EmptyDependencySetTest.java   |  3 ++-
 .../MavenITmng4180PerDependencyExclusionsTest.java |  2 ++
 .../it/MavenITmng4190MirrorRepoMergingTest.java    |  2 ++
 .../maven/it/MavenITmng4193UniqueRepoIdTest.java   |  3 ++-
 .../it/MavenITmng4196ExclusionOnPluginDepTest.java |  3 ++-
 ...MavenITmng4199CompileMeetsRuntimeScopeTest.java |  3 ++-
 ...ITmng4203TransitiveDependencyExclusionTest.java |  2 ++
 .../it/MavenITmng4207PluginWithLog4JTest.java      |  2 ++
 ...nterpolationPrefersCliOverProjectPropsTest.java |  3 ++-
 ...avenITmng4214MirroredParentSearchReposTest.java |  3 ++-
 .../it/MavenITmng4231SnapshotUpdatePolicyTest.java |  5 +++-
 ...orResolutionForManuallyCreatedArtifactTest.java |  2 ++
 ...enITmng4235HttpAuthDeploymentChecksumsTest.java |  2 ++
 ...nITmng4262MakeLikeReactorDottedPath370Test.java |  6 ++++-
 ...avenITmng4262MakeLikeReactorDottedPathTest.java |  7 ++++--
 ...Tmng4269BadReactorResolutionFromOutDirTest.java |  3 ++-
 ...4273RestrictedCoreRealmAccessForPluginTest.java |  3 ++-
 .../it/MavenITmng4274PluginRealmArtifactsTest.java |  3 ++-
 .../it/MavenITmng4275RelocationWarningTest.java    |  2 ++
 ...venITmng4276WrongTransitivePlexusUtilsTest.java |  3 ++-
 .../MavenITmng4279WagonProviderFailoverTest.java   |  2 ++
 .../it/MavenITmng4281PreferLocalSnapshotTest.java  |  3 ++-
 .../it/MavenITmng4283ParentPomPackagingTest.java   |  3 ++-
 .../MavenITmng4291MojoRequiresOnlineModeTest.java  |  5 +++-
 .../MavenITmng4292EnumTypeMojoParametersTest.java  |  3 ++-
 ...mng4293RequiresCompilePlusRuntimeScopeTest.java |  3 ++-
 ...venITmng4304ProjectDependencyArtifactsTest.java |  3 ++-
 .../it/MavenITmng4305LocalRepoBasedirTest.java     |  3 ++-
 ...309StrictChecksumValidationForMetadataTest.java |  2 ++
 ...warePluginParameterExpressionInjectionTest.java |  3 ++-
 ...nITmng4314DirectInvocationOfAggregatorTest.java |  3 ++-
 ...7PluginVersionResolutionFromMultiReposTest.java |  3 ++-
 .../it/MavenITmng4318ProjectExecutionRootTest.java |  3 ++-
 ...ng4319PluginExecutionGoalInterpolationTest.java |  3 ++-
 ...avenITmng4320AggregatorAndDependenciesTest.java |  3 ++-
 .../MavenITmng4321CliUsesPluginMgmtConfigTest.java |  3 ++-
 ...4326LocalSnapshotSuppressesRemoteCheckTest.java |  4 +++-
 ...7ExcludeForkingMojoFromForkedLifecycleTest.java |  3 ++-
 ...328PrimitiveMojoParameterConfigurationTest.java |  3 ++-
 .../it/MavenITmng4331DependencyCollectionTest.java |  5 +++-
 ...enITmng4332DefaultPluginExecutionOrderTest.java |  3 ++-
 .../it/MavenITmng4335SettingsOfflineModeTest.java  |  3 ++-
 .../maven/it/MavenITmng4338OptionalMojosTest.java  |  5 ++--
 .../it/MavenITmng4341PluginExecutionOrderTest.java |  3 ++-
 ...2IndependentMojoParameterDefaultValuesTest.java |  3 ++-
 ...venITmng4343MissingReleaseUpdatePolicyTest.java |  4 ++++
 ...enITmng4344ManagedPluginExecutionOrderTest.java |  3 ++-
 ...enITmng4345DefaultPluginExecutionOrderTest.java |  3 ++-
 ...mng4347ImportScopeWithSettingsProfilesTest.java |  3 ++-
 ...ITmng4348NoUnnecessaryRepositoryAccessTest.java |  2 ++
 ...mng4349RelocatedArtifactWithInvalidPomTest.java |  3 ++-
 ...Tmng4350LifecycleMappingExecutionOrderTest.java |  3 ++-
 ...3PluginDependencyResolutionFromPomRepoTest.java |  2 ++
 ...355ExtensionAutomaticVersionResolutionTest.java |  3 ++-
 ...NoNeedlessRelookupFromActiveCollectionTest.java |  3 ++-
 ...4357LifecycleMappingDiscoveryInReactorTest.java |  3 ++-
 ...LocallyReachableParentOutsideOfReactorTest.java |  3 ++-
 .../maven/it/MavenITmng4360WebDavSupportTest.java  |  4 ++++
 ...ITmng4361ForceDependencySnapshotUpdateTest.java |  3 ++-
 ...363DynamicAdditionOfDependencyArtifactTest.java |  3 ++-
 ...avenITmng4365XmlMarkupInAttributeValueTest.java |  3 ++-
 ...venITmng4367LayoutAwareMirrorSelectionTest.java |  9 ++++++--
 ...mng4368TimestampAwareArtifactInstallerTest.java |  4 ++++
 ...sitiveSystemPathInterpolatedWithEnvVarTest.java |  3 ++-
 ...enITmng4381ExtensionSingletonComponentTest.java |  3 ++-
 .../MavenITmng4383ValidDependencyVersionTest.java  |  3 ++-
 ...LifecycleMappingFromExtensionInReactorTest.java |  3 ++-
 .../maven/it/MavenITmng4386DebugLoggingTest.java   |  3 ++-
 .../maven/it/MavenITmng4387QuietLoggingTest.java   |  3 ++-
 ...nITmng4393ParseExternalParenPomLenientTest.java |  3 ++-
 .../MavenITmng4396AntBased20xMojoSupportTest.java  |  3 ++-
 .../it/MavenITmng4400RepositoryOrderTest.java      |  5 +++-
 ...enITmng4401RepositoryOrderForParentPomTest.java |  3 ++-
 .../it/MavenITmng4402DuplicateChildModuleTest.java |  3 ++-
 ...enITmng4403LenientDependencyPomParsingTest.java |  2 ++
 .../it/MavenITmng4404UniqueProfileIdTest.java      |  3 ++-
 .../it/MavenITmng4405ValidPluginVersionTest.java   |  3 ++-
 .../MavenITmng4408NonExistentSettingsFileTest.java |  5 +++-
 .../maven/it/MavenITmng4410UsageHelpTest.java      |  3 ++-
 .../maven/it/MavenITmng4411VersionInfoTest.java    |  2 ++
 .../it/MavenITmng4412OfflineModeInPluginTest.java  |  5 +++-
 ...avenITmng4413MirroringOfDependencyRepoTest.java |  2 ++
 .../it/MavenITmng4415InheritedPluginOrderTest.java |  6 +++--
 ...ng4416PluginOrderAfterProfileInjectionTest.java |  6 +++--
 ...1DeprecatedPomInterpolationExpressionsTest.java |  2 ++
 ...g4422PluginExecutionPhaseInterpolationTest.java |  3 ++-
 ...ssionDataFromPluginParameterExpressionTest.java |  3 ++-
 .../it/MavenITmng4428FollowHttpRedirectTest.java   | 10 ++++++++
 ...mng4429CompRequirementOnNonDefaultImplTest.java |  3 ++-
 ...nITmng4430DistributionManagementStatusTest.java |  3 ++-
 ...avenITmng4433ForceParentSnapshotUpdateTest.java |  3 ++-
 ...MavenITmng4436SingletonComponentLookupTest.java |  3 ++-
 ...ng4450StubModelForMissingDependencyPomTest.java |  3 ++-
 ...4452ResolutionOfSnapshotWithClassifierTest.java |  3 ++-
 ...g4453PluginVersionFromLifecycleMappingTest.java |  3 ++-
 ...ITmng4459InMemorySettingsKeptEncryptedTest.java |  3 ++-
 .../MavenITmng4461ArtifactUploadMonitorTest.java   |  3 ++-
 ...463DependencyManagementImportVersionRanges.java |  1 -
 ...ng4464PlatformIndependentFileSeparatorTest.java |  3 ++-
 ...65PluginPrefixFromLocalCacheOfDownRepoTest.java |  2 ++
 ...469AuthenticatedDeploymentToCustomRepoTest.java |  2 ++
 ...Tmng4470AuthenticatedDeploymentToProxyTest.java |  4 ++++
 ...enITmng4474PerLookupWagonInstantiationTest.java |  3 ++-
 ...9ProjectLevelPluginDepUsedForCliConfigTest.java |  2 ++
 ...avenITmng4482ForcePluginSnapshotUpdateTest.java |  3 ++-
 ...mng4488ValidateExternalParenPomLenientTest.java |  3 ++-
 ...MavenITmng4489MirroringOfExtensionRepoTest.java |  2 ++
 .../it/MavenITmng4498IgnoreBrokenMetadataTest.java |  3 ++-
 ...Tmng4500NoUpdateOfTimestampedSnapshotsTest.java |  2 ++
 ...4522FailUponMissingDependencyParentPomTest.java |  3 ++-
 ...venITmng4526MavenProjectArtifactsScopeTest.java |  3 ++-
 ...528ExcludeWagonsFromMavenCoreArtifactsTest.java |  3 ++-
 ...nITmng4536RequiresNoProjectForkingMojoTest.java |  3 ++-
 ...544ActiveComponentCollectionThreadSafeTest.java |  3 ++-
 ...4553CoreArtifactFilterConsidersGroupIdTest.java |  3 ++-
 ...avenITmng4554PluginPrefixMappingUpdateTest.java |  6 +++++
 ...nITmng4555MetaversionResolutionOfflineTest.java |  2 ++
 .../MavenITmng4561MirroringOfPluginRepoTest.java   |  2 ++
 ...mng4565MultiConditionProfileActivationTest.java |  2 +-
 ...4572ModelVersionSurroundedByWhitespaceTest.java |  3 ++-
 ...LevelPluginDepUsedForCliInvocInReactorTest.java |  3 ++-
 ...fixResolutionFromVersionlessPluginMngtTest.java |  3 ++-
 ...mng4590ImportedPomUsesSystemPropertiesTest.java |  3 ++-
 ...ng4600DependencyOptionalFlagManagementTest.java |  5 +++-
 ...mng4615ValidateRequiredPluginParameterTest.java | 11 ++++++++-
 ...enITmng4618AggregatorBuiltAfterModulesTest.java |  3 ++-
 ...5SettingsXmlInterpolationWithXmlMarkupTest.java |  3 ++-
 ...PomValidationErrorUponMissingSystemDepTest.java |  3 ++-
 ...mng4633DualCompilerExecutionsWeaveModeTest.java |  4 +++-
 ...44StrictPomParsingRejectsMisplacedTextTest.java |  4 ++--
 ...Tmng4654ArtifactHandlerForMainArtifactTest.java |  3 ++-
 .../it/MavenITmng4660OutdatedPackagedArtifact.java |  2 ++
 .../maven/it/MavenITmng4660ResumeFromTest.java     |  4 ++++
 .../it/MavenITmng4666CoreRealmImportTest.java      |  2 ++
 ...mng4677DisabledPluginConfigInheritanceTest.java |  3 ++-
 .../MavenITmng4679SnapshotUpdateInPluginTest.java  |  3 ++-
 ...venITmng4684DistMngtOverridenByProfileTest.java |  3 ++-
 ...ng4690InterdependentConflictResolutionTest.java |  1 -
 ...mng4696MavenProjectDependencyArtifactsTest.java |  2 ++
 ...4720DependencyManagementExclusionMergeTest.java |  3 ++-
 ...MavenITmng4721OptionalPluginDependencyTest.java |  3 ++-
 ...729MirrorProxyAuthUsedByProjectBuilderTest.java |  2 ++
 .../it/MavenITmng4745PluginVersionUpdateTest.java  |  6 +++++
 .../MavenITmng4747JavaAgentUsedByPluginTest.java   |  3 ++-
 ...esolvedMavenProjectDependencyArtifactsTest.java |  3 ++-
 ...4755FetchRemoteMetadataForVersionRangeTest.java |  3 ++-
 ...enITmng4761PluginLevelDependencyScopesTest.java |  2 ++
 .../MavenITmng4765LocalPomProjectBuilderTest.java  |  3 ++-
 ...Tmng4768NearestMatchConflictResolutionTest.java |  1 -
 ...refixResolutionDoesntTouchDisabledRepoTest.java |  2 ++
 ...rsionResolutionDoesntTouchDisabledRepoTest.java |  2 ++
 ...76ForkedReactorPluginVersionResolutionTest.java |  5 +++-
 ...tipleDepsWithVersionRangeFromLocalRepoTest.java |  3 ++-
 ...nITmng4781DeploymentToNexusStagingRepoTest.java |  2 ++
 ...4785TransitiveResolutionInForkedThreadTest.java |  3 ++-
 .../MavenITmng4786AntBased21xMojoSupportTest.java  |  3 ++-
 ...ITmng4788InstallationToCustomLocalRepoTest.java |  3 ++-
 ...ITmng4789ScopeInheritanceMeetsConflictTest.java |  3 ++-
 ...rojectBuilderResolvesRemotePomArtifactTest.java |  3 ++-
 ...utionInReactorProjectForkedByLifecycleTest.java |  3 ++-
 ...venITmng4800NearestWinsVsScopeWideningTest.java |  1 -
 ...enITmng4811CustomComponentConfiguratorTest.java |  3 ++-
 ...eResolutionOfDependenciesDuringReactorTest.java |  2 ++
 .../MavenITmng4829ChecksumFailureWarningTest.java  |  3 ++-
 ...34ParentProjectResolvedFromRemoteReposTest.java |  3 ++-
 .../it/MavenITmng4840MavenPrerequisiteTest.java    |  5 +++-
 ...mng4842ParentResolutionOfDependencyPomTest.java |  5 +++-
 ...eactorResolutionAttachedWithExclusionsTest.java |  3 ++-
 ...avenITmng4874UpdateLatestPluginVersionTest.java |  2 ++
 .../MavenITmng4877DeployUsingPrivateKeyTest.java   |  3 ++-
 ...83FailUponOverconstrainedVersionRangesTest.java |  3 ++-
 ...ng4890MakeLikeReactorConsidersVersionsTest.java |  5 +++-
 ...MavenITmng4891RobustSnapshotResolutionTest.java |  3 ++-
 ...g4895PluginDepWithNonRelocatedMavenApiTest.java |  3 ++-
 ...913UserPropertyVsDependencyPomPropertyTest.java |  3 ++-
 ...g4919LifecycleMappingWithSameGoalTwiceTest.java |  3 ++-
 ...4925ContainerLookupRealmDuringMojoExecTest.java |  3 ++-
 .../maven/it/MavenITmng4936EventSpyTest.java       |  3 ++-
 ...avenITmng4952MetadataReleaseInfoUpdateTest.java |  2 ++
 ...mng4955LocalVsRemoteSnapshotResolutionTest.java |  3 ++-
 .../MavenITmng4960MakeLikeReactorResumeTest.java   |  5 +++-
 ...venITmng4963ParentResolutionFromMirrorTest.java |  3 ++-
 .../MavenITmng4966AbnormalUrlPreservationTest.java |  3 ++-
 ...g4973ExtensionVisibleToPluginInReactorTest.java |  3 ++-
 ...975ProfileInjectedPluginExecutionOrderTest.java |  3 ++-
 ...mng4987TimestampBasedSnapshotSelectionTest.java |  3 ++-
 .../maven/it/MavenITmng4991NonProxyHostsTest.java  |  2 ++
 ...ITmng4992MapStylePropertiesParamConfigTest.java |  3 ++-
 ...nITmng5000ChildPathAwareUrlInheritanceTest.java |  3 ++-
 ...VersionRangeDependencyParentResolutionTest.java |  3 ++-
 .../it/MavenITmng5009AggregationCycleTest.java     |  3 ++-
 ...ConfigureCollectionArrayFromSystemPropTest.java |  2 ++
 ...Tmng5012CollectionVsArrayParamCoercionTest.java |  2 ++
 ...g5013ConfigureParamBeanFromScalarValueTest.java |  3 ++-
 ...ingBasedCompLookupFromChildPluginRealmTest.java |  3 ++-
 .../MavenITmng5064SuppressSnapshotUpdatesTest.java |  2 ++
 ...usionAtDependencyWithImpliedClassifierTest.java |  3 ++-
 ...AggregatorDepResolutionModuleExtensionTest.java |  3 ++-
 ...Tmng5137ReactorResolutionInForkedBuildTest.java |  3 ++-
 .../maven/it/MavenITmng5175WagonHttpTest.java      |  2 ++
 .../it/MavenITmng5206PlexusLifecycleHonoured.java  |  2 ++
 .../it/MavenITmng5208EventSpyParallelTest.java     |  2 ++
 .../maven/it/MavenITmng5214DontMapWsdlToJar.java   | 11 +++++----
 .../maven/it/MavenITmng5224InjectedSettings.java   |  1 +
 .../MavenITmng5230MakeReactorWithExcludesTest.java | 19 ++++++++++++++-
 ...g5280SettingsProfilesRepositoriesOrderTest.java |  4 ++++
 ...Tmng5418FileProjectPropertiesActivatorTest.java |  2 ++
 ...445LegacyStringSearchModelInterpolatorTest.java |  2 ++
 .../maven/it/MavenITmng5503ZipInReactorTest.java   |  2 ++
 .../MavenITmng5557ProperlyRestrictedReactor.java   |  2 +-
 .../MavenITmng5572ReactorPluginExtensionsTest.java |  2 ++
 .../maven/it/MavenITmng5576CdFriendlyVersions.java |  5 +++-
 ...mng5640LifecycleParticipantAfterSessionEnd.java | 11 ++++++++-
 .../maven/it/MavenITmng5716ToolchainsTypeTest.java |  2 +-
 .../maven/it/MavenITmng5760ResumeFeatureTest.java  |  4 +++-
 .../apache/maven/it/MavenITmng5889FindBasedir.java | 27 ++++++++++++++++++++++
 ...enITmng5895CIFriendlyUsageWithPropertyTest.java |  3 ++-
 ...ildMultimoduleWithEARFailsToResolveWARTest.java |  1 +
 .../it/MavenITmng6057CheckReactorOrderTest.java    |  3 ++-
 .../it/MavenITmng6071GetResourceWithCustomPom.java |  2 ++
 .../maven/it/MavenITmng6090CIFriendlyTest.java     |  3 ++-
 .../it/MavenITmng6118SubmoduleInvocation.java      | 26 +++++++++++++--------
 .../MavenITmng6173GetAllProjectsInReactorTest.java |  2 ++
 ...ITmng6173GetProjectsAndDependencyGraphTest.java |  2 ++
 ...MavenITmng6189SiteReportPluginsWarningTest.java |  1 -
 ...venITmng6210CoreExtensionsCustomScopesTest.java | 19 +++++++++++++++
 .../apache/maven/it/MavenITmng6223FindBasedir.java |  8 +++++++
 ...avenITmng6240PluginExtensionAetherProvider.java |  2 ++
 .../maven/it/MavenITmng6255FixConcatLines.java     |  6 +++++
 ...nITmng6256SpecialCharsAlternatePOMLocation.java |  4 ++++
 .../maven/it/MavenITmng6352PrintVersionTest.java   |  5 +++-
 .../it/MavenITmng6386BaseUriPropertyTest.java      |  1 -
 .../maven/it/MavenITmng6391PrintVersionTest.java   |  5 +++-
 .../MavenITmng6558ToolchainsBuildingEventTest.java |  2 ++
 ...ecuteAnnotationShouldNotReExecuteGoalsTest.java |  2 ++
 .../maven/it/MavenITmng6656BuildConsumer.java      |  4 ++--
 ...ng6759TransitiveDependencyRepositoriesTest.java |  4 +++-
 ...mng6772NestedImportScopeRepositoryOverride.java | 19 +++++++++++++++
 .../maven/it/MavenITmng6957BuildConsumer.java      |  4 ++--
 ...ng6981ProjectListShouldIncludeChildrenTest.java | 21 +++++++++++++++++
 ...nITmng7045DropUselessAndOutdatedCdiApiTest.java | 19 +++++++++++++++
 ...avenITmng7051OptionalProfileActivationTest.java | 21 ++++++++++++-----
 ...MavenITmng7128BlockExternalHttpReactorTest.java |  5 ++--
 590 files changed, 1519 insertions(+), 567 deletions(-)

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 2b84aa8..683a784 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -38,6 +37,8 @@ public class MavenIT0008SimplePluginTest
      * be downloaded from a remote repository before it can be executed. This
      * test also checks to make sure that mojo parameters are aligned to the
      * project basedir when their type is "java.io.File".
+     *
+     * @throws Exception in case of failure
      */
     public void testit0008()
         throws Exception
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 44dc0ef..2da398f 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -36,6 +35,8 @@ public class MavenIT0009GoalConfigurationTest
     /**
      * Test plugin configuration and goal configuration that overrides what the
      * mojo has specified.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0009()
         throws Exception
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 edb4d55..8b4541d 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -37,6 +36,8 @@ public class MavenIT0010DependencyClosureResolutionTest
      * Since the artifact resolution does not use the project builder, we must
      * ensure that the full hierarchy of all dependencies is resolved. This
      * includes the dependencies of the parent-pom's of dependencies.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0010()
         throws Exception
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 1f0e3f8..65f202f 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -35,6 +34,8 @@ public class MavenIT0011DefaultVersionByDependencyManagementTest
 
     /**
      * Test specification of dependency versions via &lt;dependencyManagement/&gt;.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0011()
         throws Exception
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 f1e4a47..156319f 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -34,6 +33,8 @@ public class MavenIT0012PomInterpolationTest
 
     /**
      * Test simple POM interpolation
+     *
+     * @throws Exception in case of failure
      */
     public void testit0012()
         throws Exception
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 1a00e74..e06225a 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -36,6 +35,8 @@ public class MavenIT0018DependencyManagementTest
      * Ensure that managed dependencies for dependency POMs are calculated
      * correctly when resolved. Removes managed-dep-1.0.3 and checks it is
      * redownloaded upon resolution of direct-dep.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0018()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMngtBySuperPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMngtBySuperPomTest.java
index 1a038d5..6df551f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMngtBySuperPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMngtBySuperPomTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -34,6 +33,8 @@ public class MavenIT0019PluginVersionMngtBySuperPomTest
 
     /**
      * Test that a version is managed by pluginManagement in the super POM
+     *
+     * @throws Exception in case of failure
      */
     public void testit0019()
         throws Exception
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 bfb0746..de2fe3f 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -35,6 +34,8 @@ public class MavenIT0021PomProfileTest
     /**
      * Test pom-level profile inclusion (this one is activated by system
      * property).
+     *
+     * @throws Exception in case of failure
      */
     public void testit0021()
         throws Exception
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 8a8bff7..ef11916 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -35,6 +34,8 @@ public class MavenIT0023SettingsProfileTest
     /**
      * Test profile inclusion from settings.xml (this one is activated by an id
      * in the activeProfiles section).
+     *
+     * @throws Exception in case of failure
      */
     public void testit0023()
         throws Exception
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 3145ecb..d142dd1 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenIT0024MultipleGoalExecutionsTest
     /**
      * Test usage of &lt;executions/&gt; inside a plugin rather than &lt;goals/&gt;
      * that are directly inside the plugin.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0024()
         throws Exception
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 fadb8b8..5448da1 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenIT0025MultipleExecutionLevelConfigsTest
 
     /**
      * Test multiple goal executions with different execution-level configs.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0025()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMngtInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMngtInheritanceTest.java
index 2feca66..6231bef 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMngtInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMngtInheritanceTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -35,6 +34,8 @@ public class MavenIT0030DepPomDepMngtInheritanceTest
     /**
      * Test for injection of dependencyManagement through parents of
      * dependency poms.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0030()
         throws Exception
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 b3a10d3..bde8780 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -34,6 +33,8 @@ public class MavenIT0032MavenPrerequisiteTest
 
     /**
      * Tests that a specified Maven version requirement that is lower doesn't cause any problems
+     *
+     * @throws Exception in case of failure
      */
     public void testit0032()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036ReleasePomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036ReleasePomTest.java
index c0007e2..6f4959e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036ReleasePomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036ReleasePomTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenIT0036ReleasePomTest
 
     /**
      * Test building from release-pom.xml when it's available
+     *
+     * @throws Exception in case of failure
      */
     public void testit0036()
         throws Exception
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 662346e..0f516db 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenIT0037AlternatePomFileSameDirTest
 
     /**
      * Test building with alternate pom file using '-f'
+     *
+     * @throws Exception in case of failure
      */
     public void testit0037()
         throws Exception
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 6501be7..fa9a2c8 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenIT0038AlternatePomFileDifferentDirTest
 
     /**
      * Test building project from outside the project directory using '-f' option.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0038()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java
index 149faf4..47c0c7d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenIT0039ReleasePomInReactorTest
      * Test reactor for projects that have release-pom.xml in addition to
      * pom.xml. The release-pom.xml file should be chosen above pom.xml for
      * these projects in the build.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0039()
         throws Exception
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 ed00423..4ab1310 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenIT0040PackagingFromPluginExtensionTest
 
     /**
      * Test the use of a packaging from a plugin
+     *
+     * @throws Exception in case of failure
      */
     public void testit0040()
         throws Exception
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 5424220..e50a291 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenIT0041ArtifactTypeFromPluginExtensionTest
 
     /**
      * Test the use of a new type from a plugin
+     *
+     * @throws Exception in case of failure
      */
     public void testit0041()
         throws Exception
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 5d33200..ad66d13 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -35,6 +34,8 @@ public class MavenIT0051ReleaseProfileTest
 
     /**
      * Test source attachment when -DperformRelease=true is specified.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0051()
         throws Exception
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 27d20f9..21bc783 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -35,6 +34,8 @@ public class MavenIT0052ReleaseProfileTest
     /**
      * Test that source attachment doesn't take place when
      * -DperformRelease=true is missing.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0052()
         throws Exception
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 e476029..93c38a5 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -35,6 +34,8 @@ public class MavenIT0056MultipleGoalExecutionsTest
     /**
      * Test that multiple executions of a goal with different
      * parameter values will succeed.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0056()
         throws Exception
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 965ecdf..83ef57e 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -35,6 +34,8 @@ public class MavenIT0063SystemScopeDependencyTest
 
     /**
      * Test the use of a system scoped dependency to a (fake) tools.jar.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0063()
         throws Exception
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 652d121..45ff68e 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -35,6 +34,8 @@ public class MavenIT0064MojoConfigViaSettersTest
     /**
      * Test the use of a mojo that uses setters instead of private fields
      * for the population of configuration values.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0064()
         throws Exception
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 d2e04b8..5bc09e4 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenIT0071PluginConfigWithDottedPropertyTest
     /**
      * Verifies that dotted property references work within plugin
      * configurations.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0071()
         throws Exception
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 f79fd36..54f47e4 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenIT0072InterpolationWithDottedPropertyTest
     /**
      * Verifies that property references with dotted notation work within
      * POM interpolation.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0072()
         throws Exception
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 af05157..1c49b38 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -38,6 +37,8 @@ public class MavenIT0085TransitiveSystemScopeTest
      * when they are resolved transitively via another (non-system)
      * dependency. Inherited scope should not apply in the case of
      * system-scoped dependencies, no matter where they are.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0085()
         throws Exception
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 26c96d0..da90aff 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenIT0086PluginRealmTest
     /**
      * Verify that a plugin dependency class/resource can be loaded from both the plugin classloader and the
      * context classloader available to the plugin.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0086()
         throws Exception
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 8cae967..c2896c7 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenIT0087PluginRealmWithProjectLevelDepsTest
     /**
      * Verify that a project-level plugin dependency class/resource can be loaded from both the plugin classloader
      * and the context classloader available to the plugin.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0087()
         throws Exception
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 2b59ee7..75c7270 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
@@ -37,6 +37,8 @@ public class MavenIT0090EnvVarInterpolationTest
     /**
      * Test that ensures that envars are interpolated correctly into plugin
      * configurations.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0090()
         throws Exception
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 a0d21bf..2a27bf3 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -36,6 +35,8 @@ public class MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest
     /**
      * Test that the auth infos given in the settings.xml are pushed into the wagon manager and are available
      * to other components/plugins.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0113()
         throws Exception
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 6f9ff1b..fe38913 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenIT0130CleanLifecycleTest
 
     /**
      * Test default binding of goals for "clean" lifecycle.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0130()
         throws Exception
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 300754b..b0afb61 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenIT0131SiteLifecycleTest
 
     /**
      * Test default binding of goals for "site" lifecycle.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0131()
         throws Exception
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 ae801c5..e3b612b 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenIT0132PomLifecycleTest
 
     /**
      * Test default binding of goals for "pom" lifecycle.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0132()
         throws Exception
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 42557cf..78605a3 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenIT0133JarLifecycleTest
 
     /**
      * Test default binding of goals for "jar" lifecycle.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0133()
         throws Exception
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 efb579d..b7d20f1 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenIT0134WarLifecycleTest
 
     /**
      * Test default binding of goals for "war" lifecycle.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0134()
         throws Exception
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 f263374..5b28902 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenIT0135EjbLifecycleTest
 
     /**
      * Test default binding of goals for "ejb" lifecycle.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0135()
         throws Exception
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 2927e2c..8ab4003 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenIT0136RarLifecycleTest
 
     /**
      * Test default binding of goals for "rar" lifecycle.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0136()
         throws Exception
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 d077d2c..e2e0deb 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenIT0137EarLifecycleTest
 
     /**
      * Test default binding of goals for "ear" lifecycle.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0137()
         throws Exception
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 3f940a9..7bdeb61 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenIT0138PluginLifecycleTest
 
     /**
      * Test default binding of goals for "maven-plugin" lifecycle.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0138()
         throws Exception
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 807b91a..3696d6e 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenIT0139InterpolationWithProjectPrefixTest
 
     /**
      * Test that expressions of the form ${project.*} resolve correctly to POM values.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0139()
         throws Exception
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 6e60d52..d0134e7 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenIT0140InterpolationWithPomPrefixTest
 
     /**
      * Test that expressions of the form ${pom.*} resolve correctly to POM values.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0140()
         throws Exception
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 ef66822..f3553e0 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -46,6 +45,8 @@ public class MavenIT0142DirectDependencyScopesTest
 
     /**
      * Test that the different scopes of direct dependencies end up on the right class paths.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0142()
         throws Exception
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 408aad1..7f5c83a 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -47,6 +46,8 @@ public class MavenIT0143TransitiveDependencyScopesTest
     /**
      * Test that the different scopes of transitive dependencies end up on the right class paths when mediated from
      * a compile-scope dependency.
+     *
+     * @throws Exception in case of failure
      */
     public void testitCompileScope()
         throws Exception
@@ -101,6 +102,8 @@ public class MavenIT0143TransitiveDependencyScopesTest
     /**
      * Test that the different scopes of transitive dependencies end up on the right class paths when mediated from
      * a provided-scope dependency.
+     *
+     * @throws Exception in case of failure
      */
     public void testitProvidedScope()
         throws Exception
@@ -146,6 +149,8 @@ public class MavenIT0143TransitiveDependencyScopesTest
     /**
      * Test that the different scopes of transitive dependencies end up on the right class paths when mediated from
      * a runtime-scope dependency.
+     *
+     * @throws Exception in case of failure
      */
     public void testitRuntimeScope()
         throws Exception
@@ -191,6 +196,8 @@ public class MavenIT0143TransitiveDependencyScopesTest
     /**
      * Test that the different scopes of transitive dependencies end up on the right class paths when mediated from
      * a test-scope dependency.
+     *
+     * @throws Exception in case of failure
      */
     public void testitTestScope()
         throws Exception
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 01a573a..4bf735e 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
@@ -41,6 +41,8 @@ public class MavenIT0144LifecycleExecutionOrderTest
 
     /**
      * Test that the lifecycle phases execute in proper order.
+     *
+     * @throws Exception in case of failure
      */
     public void testit0144()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java
index 472dc31..a2df246 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenIT0145ReactorWithIncludesExcludesTest
 
     /**
      * Test the old-style reactor mode with includes/excludes to locate projects.
+     *
+     * @throws Exception in case of failure
      */
     public void testitDefaultIncludesExcludes()
         throws Exception
@@ -64,6 +65,8 @@ public class MavenIT0145ReactorWithIncludesExcludesTest
 
     /**
      * Test the old-style reactor mode with includes/excludes to locate projects.
+     *
+     * @throws Exception in case of failure
      */
     public void testitCustomIncludes()
         throws Exception
@@ -89,6 +92,8 @@ public class MavenIT0145ReactorWithIncludesExcludesTest
 
     /**
      * Test the old-style reactor mode with includes/excludes to locate projects.
+     *
+     * @throws Exception in case of failure
      */
     public void testitCustomExcludes()
         throws Exception
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 8a0286c..299971b 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITBootstrapTest
 
     /**
      * Bootstraps the integration tests by downloading required artifacts from central repository.
+     *
+     * @throws Exception in case of failure
      */
     public void testBootstrap()
         throws Exception
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 bb2478b..76ed057 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,7 +39,9 @@ public class MavenITmng0095ReactorFailureBehaviorTest
 
     /**
      * Test fail-fast reactor behavior. Forces an exception to be thrown in
-     * the first module and checks that the second & third module is not built and the overall build fails, too.
+     * the first module and checks that the second &amp; third module is not built and the overall build fails, too.
+     *
+     * @throws Exception in case of failure
      */
     public void testitFailFast()
         throws Exception
@@ -74,7 +75,9 @@ public class MavenITmng0095ReactorFailureBehaviorTest
 
     /**
      * Test fail-never reactor behavior. Forces an exception to be thrown in
-     * the first module, but checks that the second & third module is built and the overall build succeeds.
+     * the first module, but checks that the second &amp; third module is built and the overall build succeeds.
+     *
+     * @throws Exception in case of failure
      */
     public void testitFailNever()
         throws Exception
@@ -102,6 +105,8 @@ public class MavenITmng0095ReactorFailureBehaviorTest
      * Test fail-at-end reactor behavior. Forces an exception to be thrown in
      * the first module and checks that the second module is still built but the overall build finally fails
      * and the third module (which depends on the failed module) is skipped.
+     *
+     * @throws Exception in case of failure
      */
     public void testitFailAtEnd()
         throws Exception
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 0e9794c..b83a7bf 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
@@ -45,6 +45,8 @@ public class MavenITmng0187CollectedProjectsTest
     /**
      * Verify that MavenProject.getCollectedProjects() provides access to the direct and indirect modules
      * of the current project.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 4251b7e..7b3201d 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng0249ResolveDepsFromReactorTest
 
     /**
      * Test that the reactor can establish the artifact location of known projects for dependencies.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG0249()
         throws Exception
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 fb0d31c..9f27dbe 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng0282NonReactorExecWhenProjectIndependentTest
 
     /**
      * Test non-reactor behavior when plugin declares "@requiresProject false"
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG282()
         throws Exception
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 ee43898..a45d171 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng0294MergeGlobalAndUserSettingsTest
 
     /**
      * Test merging of global- and user-level settings.xml files.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG294()
         throws Exception
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 653f011..acd9841 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng0377PluginLookupFromPrefixTest
     /**
      * Test usage of plugins.xml mapping file on the repository to resolve plugin artifactId from it's prefix using the
      * pluginGroups in the provided settings.xml.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG377()
         throws Exception
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 af546e6..0e99e87 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng0449PluginVersionResolutionTest
     /**
      * Verify that versions for plugins are automatically resolved if not given in the POM by checking first LATEST and
      * then RELEASE in the repo metadata when the plugin is invoked from the lifecycle.
+     *
+     * @throws Exception in case of failure
      */
     public void testitLifecycleInvocation()
         throws Exception
@@ -84,6 +85,8 @@ public class MavenITmng0449PluginVersionResolutionTest
     /**
      * Verify that versions for plugins are automatically resolved if not given in the POM by checking LATEST and
      * RELEASE in the repo metadata when the plugin is invoked directly from the command line.
+     *
+     * @throws Exception in case of failure
      */
     public void testitCliInvocation()
         throws Exception
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 2139a9d..679864e 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng0461TolerateMissingDependencyPomTest
 
     /**
      * Verify that dependency resolution only warns in case of missing dependency POMs but does not fail.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 7037786..f7d1281 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
@@ -42,7 +42,9 @@ public class MavenITmng0469ReportConfigTest
     }
 
     /**
-     * Test that <reporting> configuration also affects build plugins unless <build> configuration is also given.
+     * Test that {@code <reporting>} configuration also affects build plugins unless {@code <build>} configuration is also given.
+     *
+     * @throws Exception in case of failure
      */
     public void testitReportConfigOverridesBuildDefaults()
         throws Exception
@@ -63,7 +65,9 @@ public class MavenITmng0469ReportConfigTest
     }
 
     /**
-     * Test that <build> configuration dominates <reporting> configuration for build goals.
+     * Test that {@code <build>} configuration dominates {@code <reporting>} configuration for build goals.
+     *
+     * @throws Exception in case of failure
      */
     public void testitBuildConfigDominantDuringBuild()
         throws Exception
@@ -81,7 +85,9 @@ public class MavenITmng0469ReportConfigTest
     }
 
     /**
-     * Test that <build> configuration does not affect report goals.
+     * Test that {@code <build>} configuration does not affect report goals.
+     *
+     * @throws Exception in case of failure
      */
     public void testitBuildConfigIrrelevantForReports()
         throws Exception
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 bd84528..f5b5089 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng0471CustomLifecycleTest
 
     /**
      * Test @execute with a custom lifecycle, including configuration
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG471()
         throws Exception
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 0c3d0c7..82751a8 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng0479OverrideCentralRepoTest
 
     /**
      *  Verify that using the same repo id allows to override "central". This test checks the effective model.
+     *
+     * @throws Exception in case of failure
      */
     public void testitModel()
         throws Exception
@@ -115,6 +116,8 @@ public class MavenITmng0479OverrideCentralRepoTest
 
     /**
      *  Verify that using the same repo id allows to override "central". This test checks the actual repo access.
+     *
+     * @throws Exception in case of failure
      */
     public void testitResolution()
         throws Exception
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 ac858e0..77ab6cd 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng0496IgnoreUnknownPluginParametersTest
     /**
      * Test that unused configuration parameters from the POM don't cause the
      * mojo to fail...they will show up as warnings in the -X output instead.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG496()
         throws Exception
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 74e4d64..5b72474 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -45,6 +44,8 @@ public class MavenITmng0505VersionRangeTest
 
     /**
      * Test version range support.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG505()
         throws Exception
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 b4be99c..fb15c4b 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng0507ArtifactRelocationTest
 
     /**
      * Test artifact relocation.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG507()
         throws Exception
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 16ec86d..9c8c97e 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng0522InheritedPluginMgmtConfigTest
 
     /**
      * Test for injection of inherited plugin management into plugin configuration.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG522()
         throws Exception
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 128f839..0fda37a 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
@@ -116,6 +116,8 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
 
     /**
      * Test that the encrypted auth infos given in the settings.xml are decrypted.
+     *
+     * @throws Exception in case of failure
      */
     public void testitBasic()
         throws Exception
@@ -143,6 +145,8 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
     /**
      * Test that the encrypted auth infos given in the settings.xml are decrypted when the master password resides
      * in an external file.
+     *
+     * @throws Exception in case of failure
      */
     public void testitRelocation()
         throws Exception
@@ -178,6 +182,8 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
 
     /**
      * Test that the CLI supports generation of encrypted (master) passwords.
+     *
+     * @throws Exception in case of failure
      */
     public void testitEncryption()
         throws Exception
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 3a02ef4..6e21dae 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng0557UserSettingsCliOptionTest
 
     /**
      * Test --settings CLI option
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG557()
         throws Exception
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 843fbd3..7d20852 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng0612NewestConflictResolverTest
 
     /**
      * Test that ensures the newest-wins conflict resolver is used.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG612()
         throws Exception
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 88ca638..368b878 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng0666IgnoreLegacyPomTest
     /**
      * Verify that maven-1 POMs will be ignored but not stop the resolution
      * process.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG666()
         throws Exception
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 59c7874..a9297a3 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng0674PluginParameterAliasTest
 
     /**
      * Test parameter alias usage for lifecycle-bound goal execution.
+     *
+     * @throws Exception in case of failure
      */
     public void testitLifecycle()
         throws Exception
@@ -65,6 +66,8 @@ public class MavenITmng0674PluginParameterAliasTest
 
     /**
      * Test parameter alias usage for direct goal execution from CLI.
+     *
+     * @throws Exception in case of failure
      */
     public void testitCli()
         throws Exception
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 869ed68..70766d8 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng0680ParentBasedirTest
 
     /**
      * Test that the basedir of the parent is set correctly.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG680()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java
index 3e1111e..5278687 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -44,6 +43,8 @@ public class MavenITmng0731LegacyRepoLayoutTest
      * Verify that deployment of artifacts to a legacy-layout repository
      * results in a groupId directory of 'the.full.group.id' instead of
      * 'the/full/group/id'.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG731()
         throws Exception
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 2816a1f..e6cbd93 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng0761MissingSnapshotDistRepoTest
     /**
      * Test that a deployment of a snapshot falls back to a non-snapshot repository if no snapshot repository is
      * specified.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG761()
         throws Exception
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 ab314c7..6b384a4 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
@@ -53,6 +53,8 @@ public class MavenITmng0768OfflineModeTest
 
     /**
      * Test offline mode.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG768()
         throws Exception
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 982488f..3dbf87d 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng0773SettingsProfileReactorPollutionTest
 
     /**
      * Verify that profiles from settings.xml do not pollute module lists across projects in a reactorized build.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG773()
         throws Exception
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 9b4d8cc..8e189e2 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng0781PluginConfigVsExecConfigTest
     /**
      * Test that plugin-level configuration instances are not nullified by
      * execution-level configuration instances.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG0781()
         throws Exception
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 806aa83..1cec511 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng0786ProfileAwareReactorTest
     /**
      * Verify that direct invocation of a mojo from the command line still
      * results in the processing of modules included via profiles.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG0786()
         throws Exception
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 772cf84..d9dda86 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng0814ExplicitProfileActivationTest
 
     /**
      * Test activation of a profile from the command line.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG814()
         throws Exception
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 8b5ffcc..f0806c7 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng0818WarDepsNotTransitiveTest
 
     /**
      * Test that depending on a WAR doesn't also get its dependencies transitively.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG0818()
         throws Exception
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 061acf4..97e8aa1 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng0820ConflictResolutionTest
 
     /**
      * Verify that the collector selecting a particular version gets the correct subtree
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG0820()
         throws Exception
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 5b896c8..66a7beb 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng0823MojoContextPassingTest
 
     /**
      * Tests context passing between mojos in the same plugin.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG0823()
         throws Exception
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 33d9ce8..3c8f972 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
@@ -19,8 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +41,8 @@ public class MavenITmng0836PluginParentResolutionTest
      * Test that parent POMs referenced by a plugin POM can be resolved from ordinary repos, i.e. non-plugin repos.
      * As a motivation for this, imagine the plugin repository hosts only snapshots while the ordinary repository
      * hosts releases and a snapshot plugin might easily use a released parent.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG836()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848SystemPropOverridesDefaultValueTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848SystemPropOverridesDefaultValueTest.java
index 8bde6f3..a081e37 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848SystemPropOverridesDefaultValueTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848SystemPropOverridesDefaultValueTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng0848SystemPropOverridesDefaultValueTest
 
     /**
      * Test that execution/system properties take precedence over default value of plugin parameters.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG848()
         throws Exception
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 49e72c4..37623f5 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng0866EvaluateDefaultValueTest
 
     /**
      * Test that expressions inside the default value of plugin parameters are evaluated.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG866()
         throws Exception
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 247683e..8d890f8 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
@@ -21,7 +21,6 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -42,6 +41,8 @@ public class MavenITmng0870ReactorAwarePluginDiscoveryTest
     /**
      * Test that the reactor can resolve plugins that have just been built by a previous module and are not yet
      * installed to the local repo.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG0870()
         throws Exception
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 3a324fd..58f65b5 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng0947OptionalDependencyTest
     /**
      * Verify that direct optional dependencies are included in the project class paths while transitive optional
      * dependencies are excluded.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 f5578c9..456da40 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest
 
     /**
      * Test component injection from project-level plugin dependencies.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG0956()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMngtGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMngtGoalsTest.java
index 26fa397..ce097df 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMngtGoalsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMngtGoalsTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng0985NonExecutedPluginMngtGoalsTest
      * Test that plugins in pluginManagement aren't included in the build
      * unless they are referenced by groupId/artifactId within the plugins
      * section of a pom.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG0985()
         throws Exception
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 d6c985d..ae36690 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
@@ -40,6 +40,8 @@ public class MavenITmng1021EqualAttachmentBuildNumberTest
     /**
      * Test that source attachments have the same build number and timestamp as the main
      * artifact when deployed.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG1021()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMngtConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMngtConfigTest.java
index 527167d..253e10b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMngtConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMngtConfigTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng1052PluginMngtConfigTest
      * Test that configuration for a lifecycle-bound plugin is injected from
      * PluginManagement section even when it's not explicitly defined in the
      * plugins section.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG1052()
         throws Exception
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 e826378..d9e6af5 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng1073AggregatorForksReactorTest
 
     /**
      * Verify that aggregator mojos invoked from the CLI that fork the lifecycle do so for the entire reactor.
+     *
+     * @throws Exception in case of failure
      */
     public void testitForkLifecycle()
         throws Exception
@@ -66,6 +67,8 @@ public class MavenITmng1073AggregatorForksReactorTest
 
     /**
      * Verify that aggregator mojos invoked from the CLI that fork a goal do so for the entire reactor.
+     *
+     * @throws Exception in case of failure
      */
     public void testitForkGoal()
         throws Exception
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 a5c97f8..496ffe2 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng1088ReactorPluginResolutionTest
      * Test that the plugin manager falls back to resolution from the repository if a plugin is part of the reactor
      * (i.e. an active project artifact) but the lifecycle has not been executed far enough to produce a file for
      * the plugin (i.e. a phase before "compile").
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG1088()
         throws Exception
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 4acc22f..2fa9ff0 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng1142VersionRangeIntersectionTest
     /**
      * Verify that user properties from the CLI do not override POM properties of transitive dependencies.
      * This variant checks dependency order a, b.
+     *
+     * @throws Exception in case of failure
      */
     public void testitAB()
         throws Exception
@@ -52,6 +53,8 @@ public class MavenITmng1142VersionRangeIntersectionTest
     /**
      * Verify that combination of two version ranges doesn't erroneously select an exclusive upper bound.
      * This variant checks dependency order b, a.
+     *
+     * @throws Exception in case of failure
      */
     public void testitBA()
         throws Exception
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 4de23cb..a9891a2 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng1144MultipleDefaultGoalsTest
 
     /**
      * Test that multiple goals can be specified as default goal using whitespace as delimiter.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 25ad39d..f1ffa8d 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng1233WarDepWithProvidedScopeTest
 
     /**
      * Verify that overriding a transitive compile time dependency as provided in a WAR ensures it is not included.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG1233()
         throws Exception
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 764e8a5..657517d 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
@@ -22,7 +22,6 @@ package org.apache.maven.it;
 import java.io.File;
 import java.util.Properties;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -43,6 +42,8 @@ public class MavenITmng1323AntrunDependenciesTest
     /**
      * Verify that project-level plugin dependencies actually apply to the current project only and not the entire
      * reactor.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG1323()
         throws Exception
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 784aa86..c42fa5c 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
@@ -21,7 +21,6 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -41,6 +40,8 @@ public class MavenITmng1349ChecksumFormatsTest
 
     /**
      * Tests that different checksum formats are supported.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG1349()
         throws Exception
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 3369805..fec4524 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
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 37148ed..da771eb 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng1415QuotedSystemPropertiesTest
 
     /**
      * Test that quoted system properties are processed correctly. [MNG-1415]
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG1415()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java
index b69f0c0..e29168d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java
@@ -19,8 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java
index fa71adf..00378cd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java
@@ -21,13 +21,10 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1493">MNG-1493</a>.
- *
- *
  */
 public class MavenITmng1493NonStandardModulePomNamesTest
     extends AbstractMavenIntegrationTestCase
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 f15308a..fe15600 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
@@ -40,6 +40,8 @@ public class MavenITmng1701DuplicatePluginTest
 
     /**
      * Verify that duplicate plugin declarations cause a warning.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 0ec0794..a2d6436 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng1703PluginMgmtDepInheritanceTest
     /**
      * Verify that a project-level plugin dependency class/resource inherited from the parent can be loaded from both the plugin classloader
      * and the context classloader available to the plugin.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG1703()
         throws Exception
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 f7c42dc..5df353a 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
@@ -44,6 +44,8 @@ public class MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest
     /**
      * Verify that deployment always updates the metadata even if its remote timestamp currently refers to
      * the future.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 48efbd8..53330b7 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
@@ -40,6 +40,8 @@ public class MavenITmng1803PomValidationErrorIncludesLineNumberTest
 
     /**
      * Verify that POM errors indicate the line and column number in the input file.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java
index 62e1bb4..93dcdb0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java
@@ -43,6 +43,8 @@ public class MavenITmng1830ShowVersionTest
 
     /**
      * Test that the version format
+     *
+     * @throws Exception in case of failure
      */
     public void testVersion()
         throws Exception
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 61cc281..f9e1c44 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng1895ScopeConflictResolutionTest
     /**
      * Verify that for a dependency being referenced in two different scopes, the scope given directly in the POM
      * always wins, even if weaker than the scope of the transitive dependency.
+     *
+     * @throws Exception in case of failure
      */
     public void testitDirectVsIndirect()
         throws Exception
@@ -81,6 +82,8 @@ public class MavenITmng1895ScopeConflictResolutionTest
 
     /**
      * Verify that for a dependency being referenced in compile and in runtime scope, compile scope wins.
+     *
+     * @throws Exception in case of failure
      */
     public void testitCompileVsRuntime()
         throws Exception
@@ -102,6 +105,8 @@ public class MavenITmng1895ScopeConflictResolutionTest
 
     /**
      * Verify that for a dependency being referenced in compile and in test scope, compile scope wins.
+     *
+     * @throws Exception in case of failure
      */
     public void testitCompileVsTest()
         throws Exception
@@ -123,6 +128,8 @@ public class MavenITmng1895ScopeConflictResolutionTest
 
     /**
      * Verify that for a dependency being referenced in compile and in provided scope, compile scope wins.
+     *
+     * @throws Exception in case of failure
      */
     public void testitCompileVsProvided()
         throws Exception
@@ -144,6 +151,8 @@ public class MavenITmng1895ScopeConflictResolutionTest
 
     /**
      * Verify that for a dependency being referenced in runtime and in test scope, runtime scope wins.
+     *
+     * @throws Exception in case of failure
      */
     public void testitRuntimeVsTest()
         throws Exception
@@ -165,6 +174,8 @@ public class MavenITmng1895ScopeConflictResolutionTest
 
     /**
      * Verify that for a dependency being referenced in runtime and in provided scope, runtime scope wins.
+     *
+     * @throws Exception in case of failure
      */
     public void testitRuntimeVsProvided()
         throws Exception
@@ -186,6 +197,8 @@ public class MavenITmng1895ScopeConflictResolutionTest
 
     /**
      * Verify that for a dependency being referenced in provided and in test scope, provided scope wins.
+     *
+     * @throws Exception in case of failure
      */
     public void testitProvidedVsTest()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java
index 223878b..939327b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng1908LegacySnapshotUpdateTest
 
     /**
      * Test that legacy repositories with legacy snapshots (i.e. without metadata) download correctly.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG1908()
         throws Exception
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 8993b41..30ad0f9 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng1957JdkActivationWithVersionRangeTest
 
     /**
      * Test that JDK profile activation allows version ranges.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG1957()
         throws Exception
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 b54ac70..f68056a 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -44,6 +43,8 @@ public class MavenITmng1992SystemPropOverridesPomPropTest
      * Test that system/execution properties take precedence over the POM's properties section when configuring a
      * plugin parameter that is annotated with @parameter expression="prop". Note that this issue is not about POM
      * interpolation but rather plugin parameter expression evaluation.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG1992()
         throws Exception
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 debc08f..fd5c4f7 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng1995InterpolateBooleanModelElementsTest
 
     /**
      * Verify that POM fields that are of type boolean can be interpolated with expressions.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG1995()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1999DefaultReportsInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1999DefaultReportsInheritanceTest.java
index fa36ca8..c768866 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1999DefaultReportsInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1999DefaultReportsInheritanceTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng1999DefaultReportsInheritanceTest
 
     /**
      * Test that default reports can be suppressed via inheritance from the parent.
+     *
+     * @throws Exception in case of failure
      */
     public void testitInheritSuppression()
         throws Exception
@@ -63,6 +64,8 @@ public class MavenITmng1999DefaultReportsInheritanceTest
 
     /**
      * Verify that children can re-enable default reports if suppressed via inheritance from the parent.
+     *
+     * @throws Exception in case of failure
      */
     public void testitOverrideSuppression()
         throws Exception
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 9725d9b..cd8ac19 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng2006ChildPathAwareUrlInheritanceTest
     /**
      * Test that inheritance of those URLs which automatically append the child's artifact id take the child's
      * relative location to the parent into account.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2006()
         throws Exception
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 2168b09..114fd05 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
@@ -22,7 +22,6 @@ package org.apache.maven.it;
 import java.io.File;
 import java.util.List;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
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 8c2a0db..50abb06 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng2052InterpolateWithSettingsProfilePropertiesTest
      * Test that properties defined in an active profile in the user's
      * settings are available for interpolation of systemPath in a dependency.
      * [MNG-2052]
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2052()
         throws Exception
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 f198cca..1887002 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng2054PluginExecutionInheritanceTest
 
     /**
      * Test that plugin executions from &gt;1 step of inheritance don't run multiple times.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2054()
         throws Exception
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 b4c9ce5..52ae546 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
@@ -21,7 +21,6 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -45,6 +44,8 @@ public class MavenITmng2068ReactorRelativeParentsTest
 
     /**
      * Test successful lineage construction when parent inherits groupId+version from grand-parent.
+     *
+     * @throws Exception in case of failure
      */
     public void testitInheritedIdFields()
         throws Exception
@@ -62,6 +63,8 @@ public class MavenITmng2068ReactorRelativeParentsTest
 
     /**
      * Test successful lineage construction when parent specifies groupId+version itself.
+     *
+     * @throws Exception in case of failure
      */
     public void testitExplicitIdFields()
         throws Exception
@@ -79,6 +82,8 @@ public class MavenITmng2068ReactorRelativeParentsTest
 
     /**
      * Test that the implied relative path for the parent POM works, even two levels deep.
+     *
+     * @throws Exception in case of failure
      */
     public void testitComplex()
         throws Exception
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 34227a1..f4d25e6 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest
      * with the newest metadata does not provide the selected version. In particular, the repository with the
      * newest metadata must not be the only repository used during artifact resolution, all repositories must
      * be considered.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 85e24aa..cebba97 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng2103PluginExecutionInheritanceTest
 
     /**
      * Verify that the plugin-level inherited flag can be overriden by the execution-level flag.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 4360fe8..6318d88 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
@@ -22,7 +22,6 @@ package org.apache.maven.it;
 import java.io.File;
 import java.util.List;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
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 9c3acf5..c2c9c49 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -38,6 +37,8 @@ public class MavenITmng2124PomInterpolationWithParentValuesTest
 
     /**
      * Test that ${parent.artifactId} resolves correctly. [MNG-2124]
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2124()
         throws Exception
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 6c07f07..9a63a5e 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -38,6 +37,8 @@ public class MavenITmng2130ParentLookupFromReactorCacheTest
     /**
      * Test that parent-POMs cached during a build are available as parents
      * to other POMs in the multimodule build.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2130()
         throws Exception
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 c98e612..89522eb 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng2135PluginBuildInReactorTest
 
     /**
      * Test that the reactor can handle builds where one module provides a Maven plugin that another module uses.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 a35cf6f..c8e4716 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng2136ActiveByDefaultProfileTest
     /**
      * Test that &lt;activeByDefault/&gt; calculations for profile activation only
      * use profiles defined in the POM. [MNG-2136]
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2136()
         throws Exception
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 a3a2c3d..21471d9 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng2140ReactorAwareDepResolutionWhenForkTest
 
     /**
      * Test that mojos in a forked lifecycle can also resolve dependencies from the reactor.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 cdba802..1de662f 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng2174PluginDepsManagedByParentProfileTest
     /**
      * Verify that plugin dependencies defined by plugin management of a parent profile are not lost when the
      * parent's main plugin management section is also present.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2174()
         throws Exception
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 a0a8483..acc02be 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
@@ -19,8 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.VerificationException;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +39,8 @@ public class MavenITmng2196ParentResolutionTest
      * Verify that multimodule builds where one project references another as
      * a parent can build, even if that parent is not correctly referenced by
      * &lt;relativePath/&gt; and is not in the local repository. [MNG-2196]
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2196()
         throws Exception
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 4a72f3e..43afb89 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng2201PluginConfigInterpolationTest
 
     /**
      * Verify that plugin configurations are correctly interpolated
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2201()
         throws Exception
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 8843aa3..a37117e 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng2222OutputDirectoryReactorResolutionTest
      * Test that dependencies on reactor projects can be satisfied by their output directories even if those do not
      * exist (e.g. due to non-existing sources). This ensures consistent build results for "mvn compile" and
      * "mvn package".
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 c25838c..084a2fb 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng2228ComponentInjectionTest
     /**
      * Verify that components injected into plugins are actually assignment-compatible with the corresponding mojo
      * fields in case the field type is both provided by a plugin dependency and by a build extension.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2228()
         throws Exception
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 3940f31..34c6401 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -39,6 +38,8 @@ public class MavenITmng2234ActiveProfilesFromSettingsTest
     /**
      * Verify that the activeProfile section from the settings.xml can also activate profiles specified in the POM,
      * i.e. outside of the settings.xml.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2234()
         throws Exception
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 260e6b8..86ea2cf 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
@@ -22,7 +22,6 @@ package org.apache.maven.it;
 import java.io.File;
 import java.util.Properties;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -43,6 +42,8 @@ public class MavenITmng2254PomEncodingTest
 
     /**
      * Verify that the encoding declaration of the POM is respected.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2254 ()
         throws Exception
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 221fbfc..ed09984 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng2276ProfileActivationBySettingsPropertyTest
 
     /**
      * Test that profiles in the POM can be activated by properties declared in active profiles from the settings.
+     *
+     * @throws Exception in case of failure
      */
     public void testitActivation()
         throws Exception
@@ -64,6 +65,8 @@ public class MavenITmng2276ProfileActivationBySettingsPropertyTest
 
     /**
      * Tests that system properties defined on the CLI are dominant over settings properties during profile activation.
+     *
+     * @throws Exception in case of failure
      */
     public void testitCliWins()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java
index 525ff61..caa3dea 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java
@@ -21,7 +21,6 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
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 c28b406..42c517c 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng2293CustomPluginParamImplTest
 
     /**
      * Verify that default implementation of an implementation for a complex object works as expected.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2293()
         throws Exception
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 8582ad0..317b460 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
@@ -60,6 +60,8 @@ public class MavenITmng2305MultipleProxiesTest
     /**
      * Verify that proxies can be setup for multiple protocols, in this case HTTP and HTTPS. As a nice side effect,
      * this checks HTTPS tunneling over a web proxy.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 7666aa4..56a51a5 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
@@ -41,6 +41,8 @@ public class MavenITmng2309ProfileInjectionOrderTest
 
     /**
      * Test that profiles are injected in declaration order, with the last profile being the most dominant.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2309()
         throws Exception
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 9371678..34cd0b7 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng2318LocalParentResolutionTest
 
     /**
      * When a project has modules and its parent is not preinstalled [MNG-2318]
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2318()
         throws Exception
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 3b21096..09a76e9 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
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 ac38dca..fc2dfc7 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
@@ -41,6 +41,8 @@ public class MavenITmng2362DeployedPomEncodingTest
     /**
      * Verify that installed/deployed POMs retain their original file encoding and don't get messed up by some
      * transformation that erroneously uses the platform's default encoding for reading/writing them.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 4620bde..712a5a2 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng2363BasedirAwareFileActivatorTest
     /**
      * Test that the file-based profile activator resolves relative paths against the current project's base directory
      * and also interpolates ${basedir} if explicitly given, just like usual for other parts of the POM.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 50de0a8..94c8fad 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
@@ -112,6 +112,8 @@ public class MavenITmng2387InactiveProxyTest
 
     /**
      * Test that no proxy is used if none of the configured proxies is actually set as active.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 3803d21..30853c4 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
@@ -21,7 +21,6 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -42,6 +41,8 @@ public class MavenITmng2432PluginPrefixOrderTest
     /**
      * Verify that when resolving plugin prefixes the plugins from the POM are searched before the plugin groups
      * from the settings.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2432()
         throws Exception
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 2e9b295..1299788 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng2486TimestampedDependencyVersionInterpolationTest
      * Verify that the expression ${project.version} gets resolved to X-SNAPSHOT and not the actual timestamp
      * during transitive dependency resolution. In part, this depends on the deployed SNAPSHOT POMs to retain their
      * X-SNAPSHOT project version and not having it replaced with the timestamp version.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java
index 807d3ac..6d0bc30 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng2539PluginDependenciesComeFromPluginReposTest
 
     /**
      * Verify that dependencies specified in plugins are also retrieved from ordinary/non-plugin repositories.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2539()
         throws Exception
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 551b3fa..b26c132 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
@@ -20,7 +20,6 @@ package org.apache.maven.it;
  */
 
 import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.Verifier;
 
 import java.io.File;
 import java.util.Date;
@@ -29,8 +28,6 @@ import java.text.SimpleDateFormat;
 
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2562">MNG-2562</a>.
- *
- *
  */
 public class MavenITmng2562Timestamp322Test
     extends AbstractMavenIntegrationTestCase
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562TimestampTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562TimestampTest.java
index 94476d3..73c30ba 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562TimestampTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562TimestampTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
  */
 
 import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.Verifier;
 
 import java.io.File;
 import java.util.Date;
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 853e162..3d7516b 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
@@ -21,7 +21,6 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -50,6 +49,8 @@ public class MavenITmng2576MakeLikeReactorTest
 
     /**
      * Verify that project list by itself only builds specified projects.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMakeOnlyList()
         throws Exception
@@ -75,6 +76,8 @@ public class MavenITmng2576MakeLikeReactorTest
 
     /**
      * Verify that project list and all their upstream projects are built.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMakeUpstream()
         throws Exception
@@ -101,6 +104,8 @@ public class MavenITmng2576MakeLikeReactorTest
 
     /**
      * Verify that project list and all their downstream projects are built.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMakeDownstream()
         throws Exception
@@ -127,6 +132,8 @@ public class MavenITmng2576MakeLikeReactorTest
 
     /**
      * Verify that project list and all their upstream and downstream projects are built.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMakeBoth()
         throws Exception
@@ -154,6 +161,8 @@ public class MavenITmng2576MakeLikeReactorTest
 
     /**
      * Verify that using the mere basedir in the project list properly matches projects with non-default POM files.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMatchesByBasedir()
         throws Exception
@@ -180,6 +189,8 @@ public class MavenITmng2576MakeLikeReactorTest
 
     /**
      * Verify that using the mere basedir in the project list properly matches projects with non-default POM files.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMatchesByBasedirPlus()
         throws Exception
@@ -208,6 +219,8 @@ public class MavenITmng2576MakeLikeReactorTest
     }
     /**
      * Verify that the project list can also specify project ids.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMatchesById()
         throws Exception
@@ -233,6 +246,8 @@ public class MavenITmng2576MakeLikeReactorTest
 
     /**
      * Verify that the project list can also specify artifact ids.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMatchesByArtifactId()
         throws Exception
@@ -261,6 +276,8 @@ public class MavenITmng2576MakeLikeReactorTest
 
     /**
      * Verify that reactor is resumed from specified project.
+     *
+     * @throws Exception in case of failure
      */
     public void testitResumeFrom()
         throws Exception
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 4031424..538c9b1 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng2577SettingsXmlInterpolationTest
 
     /**
      * Verify that the settings.xml can be interpolated using environment variables.
+     *
+     * @throws Exception in case of failure
      */
     public void testitEnvVars()
         throws Exception
@@ -64,6 +65,8 @@ public class MavenITmng2577SettingsXmlInterpolationTest
 
     /**
      * Verify that the settings.xml can be interpolated using system properties.
+     *
+     * @throws Exception in case of failure
      */
     public void testitSystemProps()
         throws Exception
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 6117790..22ad5a8 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng2591MergeInheritedPluginConfigTest
     /**
      * Test aggregation of list configuration items for build plugins when using 'combine.children=append' attribute.
      * This variation of the test does not employ profiles.
+     *
+     * @throws Exception in case of failure
      */
     public void testitNoProfile()
         throws Exception
@@ -53,6 +54,8 @@ public class MavenITmng2591MergeInheritedPluginConfigTest
     /**
      * Test aggregation of list configuration items for build plugins when using 'combine.children=append' attribute.
      * This variation of the test employs active profiles which however are empty and should not change the result.
+     *
+     * @throws Exception in case of failure
      */
     public void testitWithProfile()
         throws Exception
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 f717e6d..749bdd2 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
@@ -22,7 +22,6 @@ package org.apache.maven.it;
 import java.io.File;
 import java.util.Properties;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -43,6 +42,8 @@ public class MavenITmng2605BogusProfileActivationTest
     /**
      * Test that profiles are not accidentally activated when they have no activation element at all and
      * the user did not request their activation via id.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2605()
         throws Exception
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 fb81bf1..735c292 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
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 447e2c1..fd0e6eb 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng2693SitePluginRealmTest
 
     /**
      * Verify that a plugin class/resource can be loaded from the plugin realm, also during the site lifecycle.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 b444d0c..1fcecad 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng2695OfflinePluginSnapshotsTest
 
     /**
      * Verify that snapshot plugins which are scheduled for an update don't fail the build when in offline mode.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2695()
         throws Exception
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 2d8fd3e..cd633db 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng2738ProfileIdCollidesWithCliOptionTest
     /**
      * Verify that the CLI parsing properly handles activation of profiles whose id happens to match a short command
      * line option.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 1b1e699..8531b97 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
@@ -26,10 +26,10 @@ import java.util.List;
 
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2739">MNG-2739</a>.
+ * todo Fill in a better description of what this test verifies!
  *
  * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
  * @author jdcasey
- * @todo Fill in a better description of what this test verifies!
  */
 public class MavenITmng2739RequiredRepositoryElementsTest
     extends AbstractMavenIntegrationTestCase
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 f1c91a0..a2ac8dd 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng2741PluginMetadataResolutionErrorMessageTest
 
     /**
      * Tests that plugin prefix metadata resolution errors tell the underlying transport issue.
+     *
+     * @throws Exception in case of failure
      */
     public void testitPrefix()
         throws Exception
@@ -50,6 +51,8 @@ public class MavenITmng2741PluginMetadataResolutionErrorMessageTest
 
     /**
      * Tests that plugin version metadata resolution errors tell the underlying transport issue.
+     *
+     * @throws Exception in case of failure
      */
     public void testitVersion()
         throws Exception
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 4f40542..c9b0b96 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
@@ -21,7 +21,6 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -41,6 +40,8 @@ public class MavenITmng2744checksumVerificationTest
 
     /**
      * Tests that hex digits of checksums are compared without regard to case.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2744()
         throws Exception
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 fc220a3..57504f8 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng2749ExtensionAvailableToPluginTest
 
     /**
      * Verify that plugins can load classes/resources from a build extension.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2749()
         throws Exception
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 cf84dad..b6e1a44 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng2771PomExtensionComponentOverrideTest
 
     /**
      * Test that ensures the POM extensions can override default component implementations.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2771()
         throws Exception
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 9e48f1f..0dac408 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
@@ -44,6 +44,8 @@ public class MavenITmng2790LastUpdatedMetadataTest
 
     /**
      * Verify that the field lastUpdated of existing local repo metadata is updated upon install of new a snapshot.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2790()
         throws Exception
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 a337d61..37c6fff 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
@@ -40,6 +40,8 @@ public class MavenITmng2820PomCommentsTest
 
     /**
      * Verify that installed/deployed POMs retain any XML-comments like license headers.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 c7c90f9..754b0fe 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest
 
     /**
      * Test the use of a custom lifecycle from a plugin that is defined as a build extension.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2831()
         throws Exception
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 58b787b..57ab2ad 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng2843PluginConfigPropertiesInjectionTest
 
     /**
      * Test that plugins can have the project properties injected via ${project.properties}.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2843()
         throws Exception
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 12d48d1..e52571e 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng2848ProfileActivationByEnvironmentVariableTest
 
     /**
      * Test activation of a profile via environment variables.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java
index d826095..7102199 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
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 464372a..e409ab7 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng2865MirrorWildcardTest
 
     /**
      * Test that the mirror wildcard * matches any repo, in particular file:// repos.
+     *
+     * @throws Exception in case of failure
      */
     public void testitFileRepo()
         throws Exception
@@ -51,6 +52,8 @@ public class MavenITmng2865MirrorWildcardTest
 
     /**
      * Test that the mirror wildcard * matches any repo, in particular http://localhost repos.
+     *
+     * @throws Exception in case of failure
      */
     public void testitLocalhostRepo()
         throws Exception
@@ -60,6 +63,8 @@ public class MavenITmng2865MirrorWildcardTest
 
     /**
      * Test that the mirror wildcard * matches any repo, in particular external repos.
+     *
+     * @throws Exception in case of failure
      */
     public void testitExternalRepo()
         throws Exception
@@ -69,6 +74,8 @@ public class MavenITmng2865MirrorWildcardTest
 
     /**
      * Test that the mirror wildcard * matches any repo, in particular central.
+     *
+     * @throws Exception in case of failure
      */
     public void testitCentralRepo()
         throws Exception
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 d8c272f..08af2cd 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng2871PrePackageSubartifactResolutionTest
     /**
      * Verify that dependencies on not-yet-packaged sub artifacts in build phases prior to package can be satisfied
      * from a module's output directory, i.e. with the loose class files.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2871()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2878DefaultReportXmlImportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2878DefaultReportXmlImportTest.java
index 45c108f..bd7a08c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2878DefaultReportXmlImportTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2878DefaultReportXmlImportTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng2878DefaultReportXmlImportTest
 
     /**
      * Verify that a plugin can load default-report.xml from the core.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2878()
         throws Exception
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 ded5641..4dcd55c 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng2892HideCorePlexusUtilsTest
     /**
      * Verify that plugins can use their own version of plexus-utils and are not bound to the version bundled in the
      * core.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2892()
         throws Exception
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 256dc01..30fc90e 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -49,6 +48,8 @@ public class MavenITmng2921ActiveAttachedArtifactsTest
      * packaged. MNG-2871 on the other hand is about dependencies that haven't been packaged yet but merely exist
      * as loose class files in a module's output directory. In other words, this test is concerned with the situation
      * during the lifecycle phase "package" while MNG-2871 is concerned with earlier phases like "test".
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2921()
         throws Exception
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 b7e9f2b..a3f63bc 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
@@ -21,7 +21,6 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -42,6 +41,8 @@ public class MavenITmng2926PluginPrefixOrderTest
     /**
      * Verify that when resolving plugin prefixes the group org.apache.maven.plugins is searched before
      * org.codehaus.mojo and that custom groups from the settings are searched before these standard ones.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG2926()
         throws Exception
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 44fd767..42c3182 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng2972OverridePluginDependencyTest
 
     /**
      * Verify that a project-level plugin dependency replaces the original dependency from the plugin POM.
+     *
+     * @throws Exception in case of failure
      */
     public void testitLifecycleInvocation()
         throws Exception
@@ -71,6 +72,8 @@ public class MavenITmng2972OverridePluginDependencyTest
      * another hash code for the dependency artifact and thereby changing its position in the HashSet's element order.
      * The two versions 0.2-mng-2972 and 9.9-MNG-2972 we use here have at least once proven (on Sun JDK 1.6.0_07) to
      * successfully break the correctness of the random ordering.
+     *
+     * @throws Exception in case of failure
      */
     public void testitCommandLineInvocation()
         throws Exception
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 4bb218c..a8690ca 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng2994SnapshotRangeRepositoryTest
 
     /**
      * Test that snapshot repositories are checked for ranges with snapshot boundaries.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 4b5d7b5..184df8a 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,7 +39,9 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
 
     /**
      * Test fail-fast reactor behavior. Forces an exception to be thrown in
-     * the first module and checks that the second & third module is not built and the overall build fails, too.
+     * the first module and checks that the second &amp; third module is not built and the overall build fails, too.
+     *
+     * @throws Exception in case of failure
      */
     public void testitFailFastSingleThread()
         throws Exception
@@ -76,7 +77,9 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
 
     /**
      * Test fail-never reactor behavior. Forces an exception to be thrown in
-     * the first module, but checks that the second & third module is built and the overall build succeeds.
+     * the first module, but checks that the second &amp; third module is built and the overall build succeeds.
+     *
+     * @throws Exception in case of failure
      */
     public void testitFailNeverSingleThread()
         throws Exception
@@ -105,6 +108,8 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
      * Test fail-at-end reactor behavior. Forces an exception to be thrown in
      * the first module and checks that the second module is still built but the overall build finally fails
      * and the third module (which depends on the failed module) is skipped.
+     *
+     * @throws Exception in case of failure
      */
     public void testitFailAtEndSingleThread()
         throws Exception
@@ -139,7 +144,9 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
 
     /**
      * Test fail-never reactor behavior. Forces an exception to be thrown in
-     * the first module, but checks that the second & third module is built and the overall build succeeds.
+     * the first module, but checks that the second &amp; third module is built and the overall build succeeds.
+     *
+     * @throws Exception in case of failure
      */
     public void testitFailNeverTwoThreads()
         throws Exception
@@ -168,6 +175,8 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
      * Test fail-at-end reactor behavior. Forces an exception to be thrown in
      * the first module and checks that the second module is still built but the overall build finally fails
      * and the third module (which depends on the failed module) is skipped.
+     *
+     * @throws Exception in case of failure
      */
     public void testitFailAtEndTwoThreads()
         throws Exception
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 826f572..1f5bce0 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3012CoreClassImportTest
     /**
      * Verify that classes shared with the Maven core realm are imported into the plugin realm such that instances of
      * these classes created by the core can be cast to classes loaded by the plugin.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3012()
         throws Exception
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 aea26f1..6de3528 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
@@ -47,6 +47,8 @@ public class MavenITmng3023ReactorDependencyResolutionTest
      * has not been called, i.e. the output directory for the compiled classes has not been created yet, the
      * dependency project artifact should not have a file associated with it. Therefore, the dependency artifact
      * should fail to resolve, and the build should fail.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3023A() throws Exception
     {
@@ -82,6 +84,8 @@ public class MavenITmng3023ReactorDependencyResolutionTest
      * (a directory) associated with it, since the 'compile' phase has run. This location should be
      * present in the compile classpath output from the maven-it-plugin-dependency-resolution:compile
      * mojo execution.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3023B()
         throws Exception
@@ -116,6 +120,8 @@ public class MavenITmng3023ReactorDependencyResolutionTest
      * Afterwards, the projects are cleaned and a separate Maven call to the 'initialize' phase should succeed, since
      * the dependency artifact has been installed locally. This second execution should use the jar file
      * from the local repository in its classpath output.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3023C()
         throws Exception
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 8c3cdab..ac8fecd 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
@@ -22,8 +22,6 @@ package org.apache.maven.it;
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
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 3b3efef..b093476 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng3043BestEffortReactorResolutionTest
      * Test that dependencies on attached artifacts like a test JAR or an EJB client JAR which have not been built
      * yet, i.e. in build phases prior to "package" like "test", are satisfied from the output directories of the
      * projects in the reactor. This is meant as a best effort to provide a class path for compilation or testing.
+     *
+     * @throws Exception in case of failure
      */
     public void testitTestPhase()
         throws Exception
@@ -97,6 +98,8 @@ public class MavenITmng3043BestEffortReactorResolutionTest
      * Test that dependency resolution still uses the actual artifact files once these have been
      * assembled/attached in the "package" phase. This ensures the class path is accurate and not locked to
      * the output directories of the best effort model from above.
+     *
+     * @throws Exception in case of failure
      */
     public void testitPackagePhase()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java
index c836803..b9f64a6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java
@@ -32,7 +32,7 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3057">MNG-3057</a>.
  *
- * @todo Fill in a better description of what this test verifies!
+ * todo Fill in a better description of what this test verifies!
  *
  * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
  * @author jdcasey
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 6daf083..fecf716 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3092SnapshotsExcludedFromVersionRangeTest
     /**
      * Verify that snapshots are not included in version ranges unless explicitly declared as the lower/upper bound
      * of the range.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 f404bf1..e52fbab 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3099SettingsProfilesWithNoPomTest
      * Verify that (active) profiles from the settings are effective even if no POM is in use (e.g archetype:create).
      * In more detail, this means the plugin can be resolved from the repositories given in the settings and the plugin
      * can access properties defined by the profiles.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java
index 64ca615..cd75911 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java
@@ -21,7 +21,6 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -43,6 +42,7 @@ public class MavenITmng3106ProfileMultipleActivatorsTest
      * The profiles should be activated even though only one of the activators
      * returns true.
      *
+     * @throws Exception in case of failure
      */
     public void testProfilesWithMultipleActivators()
         throws Exception
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 6170eec..1578245 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3118TestClassPathOrderTest
 
     /**
      * Check that test classes appear before main classes on the test class path.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 b7d3143..904e85c 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng3122ActiveProfilesNoDuplicatesTest
     /**
      * Verify that MavenProject.getActiveProfiles() reports profiles from the settings.xml with activeByDefault=true
      * only once.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3122()
         throws Exception
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 d6fc35f..4f50e4d 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,7 +41,9 @@ public class MavenITmng3133UrlNormalizationNotBeforeInterpolationTest
     /**
      * Verify that URL normalization does not happen before interpolation which would result in invalid
      * inherited URLs for project layouts where the parent resides in a sibling directory of the child
-     * and expressions are used for the parent URLs ("${expression}/../foo" -> "foo").
+     * and expressions are used for the parent URLs ("${expression}/../foo" -&gt; "foo").
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 74dca3f..d672f18 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest
 
     /**
      * Test that locally cached metadata of blacklisted repositories is consulted to resolve metaversions.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3139()
         throws Exception
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 3bd90b4..9c87b42 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng3183LoggingToFileTest
 
     /**
      * Test that the CLI parameter -l can be used to direct logging to a file.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 2a881f7..2ea868b 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
@@ -21,14 +21,12 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3203">MNG-3203</a>.
  *
- * @todo Fill in a better description of what this test verifies!
+ * todo Fill in a better description of what this test verifies!
  *
  * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
  * @author jdcasey
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 caf4388..5e22a61 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3208ProfileAwareReactorSortingTest
 
     /**
      * Verify that project sorting consideres dependencies injected by profiles.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 30f742a..63dc5ed 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3217InterPluginDependencyTest
     /**
      * Verify that the dependency of plugin A on some plugin B does not influence the build of another module in the
      * reactor that uses a different version of plugin B for normal build tasks.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3217()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java
index 8744bb8..c29b923 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
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 061a7f3..62c8624 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
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 51541ff..03a085c 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3271DefaultReportsSuppressionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3271DefaultReportsSuppressionTest.java
index 6b27586..e671c30 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3271DefaultReportsSuppressionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3271DefaultReportsSuppressionTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng3271DefaultReportsSuppressionTest
 
     /**
      * Test that default reports can be suppressed.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3271()
         throws Exception
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 51e3610..f1cce24 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
@@ -21,7 +21,6 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -40,6 +39,8 @@ public class MavenITmng3284UsingCachedPluginsTest
     /**
      * Verify that the effective plugin versions used for a project are not influenced by other instances of this
      * plugin in the reactor, i.e. each module gets exactly the plugin version it declares.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3284()
         throws Exception
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 fad5ae3..cc4c993 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
@@ -38,6 +38,8 @@ public class MavenITmng3288SystemScopeDirTest
 
     /**
      * Test the use of a system scoped dependency to a directory instead of a JAR which should fail early.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3288()
         throws Exception
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 680ff24..2355ec7 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng3297DependenciesNotLeakedToMojoTest
     /**
      * Test that project dependencies resolved for one mojo are not exposed to another mojo if the latter
      * does not require dependency resolution.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 2981332..5fac447 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng3314OfflineSnapshotsTest
 
     /**
      * Verify that snapshot dependencies which are scheduled for an update don't fail the build when in offline mode.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3314 ()
         throws Exception
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 fe05192..98f22c6 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
@@ -21,7 +21,6 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
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 84ca042..a80895e 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
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 2798305..79c57b2 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
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 eaf0c89..a8fe710 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
@@ -41,6 +41,8 @@ public class MavenITmng3379ParallelArtifactDownloadsTest
     /**
      * Tests that parallel downloads of artifacts from both the same and from different group ids don't corrupt
      * the local repo.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3379()
         throws Exception
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 cb73756..68497bc 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -48,6 +47,8 @@ public class MavenITmng3380ManagedRelocatedTransdepsTest
 
     /**
      * Verify that dependency resolution considers dependency management also for relocated artifacts.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3380()
         throws Exception
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 150f90d..1ee257d 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
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 65cf19a..2d230d3 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
@@ -21,7 +21,6 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
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 7b42182..ef16476 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
@@ -42,6 +42,8 @@ public class MavenITmng3401CLIDefaultExecIdTest
     /**
      * Test that the configuration of an execution block with the id "default-cli" applies to direct CLI
      * invocations of a goal as well if the plugin is configured under build/plugins.
+     *
+     * @throws Exception in case of failure
      */
     public void testitWithoutPluginManagement()
         throws Exception
@@ -52,6 +54,8 @@ public class MavenITmng3401CLIDefaultExecIdTest
     /**
      * Test that the configuration of an execution block with the id "default-cli" applies to direct CLI
      * invocations of a goal as well if the plugin is configured under build/pluginManagement/plugins.
+     *
+     * @throws Exception in case of failure
      */
     public void testitWithPluginManagement()
         throws Exception
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 e92b2d2..c14852f 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
@@ -37,8 +37,6 @@ import java.util.concurrent.ConcurrentLinkedDeque;
 
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3415">MNG-3415</a>.
- *
- *
  */
 public class MavenITmng3415JunkRepositoryMetadataTest
     extends AbstractMavenIntegrationTestCase
@@ -56,9 +54,9 @@ public class MavenITmng3415JunkRepositoryMetadataTest
     /**
      * This test simply verifies that when a metadata transfer fails (network error, etc.)
      * no metadata file is written to the local repository.
-     * <p/>
+     * <p>
      * Steps executed to verify this test:
-     * <p/>
+     * </p>
      * 0. Find the local repository directory:
      * a. build the maven-find-local-repo-plugin, then run it, to spit out the path of the
      * local repository in use by default. Read the output file to get this path.
@@ -75,6 +73,8 @@ public class MavenITmng3415JunkRepositoryMetadataTest
      * repository afterwards.
      * 3. Build the test project the second time
      * a. See (2.a) and (2.b) above; the same criteria applies here.
+     *
+     * @throws Exception in case of failure
      */
     public void testitTransferFailed()
         throws Exception
@@ -126,9 +126,9 @@ public class MavenITmng3415JunkRepositoryMetadataTest
     /**
      * This test simply verifies that when metadata doesn't exist on the remote
      * repository, a basic metadata file is written to the local repository.
-     * <p/>
+     * <p>
      * Steps executed to verify this test:
-     * <p/>
+     * </p>
      * 0. Find the local repository directory:
      * a. build the maven-find-local-repo-plugin, then run it, to spit out the path of the
      * local repository in use by default. Read the output file to get this path.
@@ -145,6 +145,8 @@ public class MavenITmng3415JunkRepositoryMetadataTest
      * a. Verify that the remote repository is NOT checked for the metadata file again
      * b. Verify that the file used for updateInterval calculations was NOT changed from
      * the first build.
+     *
+     * @throws Exception in case of failure
      */
     public void testShouldNotRepeatedlyUpdateOnResourceNotFoundException()
         throws Exception
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 4f1fb7e..f6cae68 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -44,6 +43,8 @@ public class MavenITmng3422ActiveComponentCollectionTest
 
     /**
      * Verify that active collections of core components are properly injected into plugins.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3422()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java
index e8a81ff..adf18bd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.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 b1d49b4..ac29333 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
@@ -50,6 +50,8 @@ public class MavenITmng3461MirrorMatchingTest
     /**
      * Test that mirror definitions are properly evaluated. In particular, an exact match by id should always
      * win over wildcard matches.
+     *
+     * @throws Exception in case of failure
      */
     public void testitExactMatchDominatesWildcard()
         throws Exception
@@ -73,6 +75,8 @@ public class MavenITmng3461MirrorMatchingTest
     /**
      * Test that mirror definitions are properly evaluated. In particular, the wildcard external:* should not
      * match file:// and localhost repos but only external repos.
+     *
+     * @throws Exception in case of failure
      */
     public void testitExternalWildcard()
         throws Exception
@@ -153,6 +157,8 @@ public class MavenITmng3461MirrorMatchingTest
     /**
      * Test that mirror definitions are properly evaluated. In particular, the wildcards within a single mirrorOf
      * spec should not be greedy.
+     *
+     * @throws Exception in case of failure
      */
     public void testitNonGreedyWildcard()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictCheckumVerificationOfDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictCheckumVerificationOfDependencyPomTest.java
index a6d48c0..b1c59c5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictCheckumVerificationOfDependencyPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictCheckumVerificationOfDependencyPomTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng3470StrictCheckumVerificationOfDependencyPomTest
 
     /**
      * Verify that strict checksum verification fails the build in case a dependency POM is corrupt.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 c199ed7..90801eb 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -44,6 +43,8 @@ public class MavenITmng3475BaseAlignedDirTest
 
     /**
      * Verify that project directories are basedir aligned when queried by plugin parameter expressions.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3475()
         throws Exception
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 38a02f9..f03e850 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -27,8 +26,6 @@ import java.util.List;
 
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3477">MNG-3477</a>.
- *
- *
  */
 public class MavenITmng3477DependencyResolutionErrorMessageTest
     extends AbstractMavenIntegrationTestCase
@@ -41,6 +38,8 @@ public class MavenITmng3477DependencyResolutionErrorMessageTest
 
     /**
      * Tests that dependency resolution errors tell the underlying transport issue.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 b44a9c8..641834e 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
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 2776d41..f65aafd 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
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 90a079e..4a07b1f 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -27,7 +26,7 @@ import java.io.File;
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3498">MNG-3498</a>.
  *
- * @todo Fill in a better description of what this test verifies!
+ * todo Fill in a better description of what this test verifies!
  *
  * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
  * @author jdcasey
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 b1825f7..105529f 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng3529QuotedCliArgTest
 
     /**
      * Verify that the command line processing doesn't choke on things like -Da=" ".
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3530DynamicPOMInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3530DynamicPOMInterpolationTest.java
index 8fa8c60..eb3ecf2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3530DynamicPOMInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3530DynamicPOMInterpolationTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
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 84703f1..0b53c0f 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
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 7509fee..2b0b772 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
@@ -20,7 +20,6 @@ package org.apache.maven.it;
  */
 
 import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.Verifier;
 
 import java.io.File;
 
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 e35684d..69527fe 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
@@ -21,7 +21,6 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -41,6 +40,7 @@ public class MavenITmng3545ProfileDeactivationTest
     /**
      * Test build with two active by default profiles
      *
+     * @throws Exception in case of failure
      */
     public void testBasicBuildWithDefaultProfiles()
         throws Exception
@@ -67,6 +67,7 @@ public class MavenITmng3545ProfileDeactivationTest
     /**
      * Test command line deactivation of active by default profiles.
      *
+     * @throws Exception in case of failure
      */
     public void testDeactivateDefaultProfilesHyphen()
         throws Exception
@@ -116,6 +117,7 @@ public class MavenITmng3545ProfileDeactivationTest
      * Test command line deactivation of a profile that was activated
      * by a property
      *
+     * @throws Exception in case of failure
      */
     public void testDeactivateActivatedByProp()
         throws Exception
@@ -146,6 +148,7 @@ public class MavenITmng3545ProfileDeactivationTest
      * Test that deactivating from the command line takes priority over
      * activating from the command line.
      *
+     * @throws Exception in case of failure
      */
     public void testActivateThenDeactivate()
         throws Exception
@@ -176,6 +179,7 @@ public class MavenITmng3545ProfileDeactivationTest
      * Test that default profiles are deactivated when another profile is
      * activated.
      *
+     * @throws Exception in case of failure
      */
     public void testDefaultProfileAutoDeactivation()
         throws Exception
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 bd29920..4eb0bd0 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -39,6 +38,8 @@ public class MavenITmng3575HexadecimalOctalPluginParameterConfigTest
 
     /**
      * Verify that numeric plugin parameters can be configured using hexadecimal/octal notation.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 318db30..e59687f 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng3581PluginUsesWagonDependencyTest
 
     /**
      * Test that a plugin using a specific wagon implementation directly works.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 45bfa84..982677d 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng3586SystemScopePluginDependencyTest
     /**
      * Test that plugin dependencies with scope system are part of the plugin class realm. This test checks
      * dependencies that are declared in the plugin POM.
+     *
+     * @throws Exception in case of failure
      */
     public void testitFromPlugin()
         throws Exception
@@ -68,6 +69,8 @@ public class MavenITmng3586SystemScopePluginDependencyTest
     /**
      * Test that plugin dependencies with scope system are part of the plugin class realm. This test checks
      * dependencies that are declared in the project POM that uses the plugin.
+     *
+     * @throws Exception in case of failure
      */
     public void testitFromProject()
         throws Exception
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 44e0f40..2817335 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
@@ -190,6 +190,8 @@ public class MavenITmng3599useHttpProxyForWebDAVMk2Test
 
     /**
      * Test that HTTP proxy is used for HTTP and for WebDAV.
+     *
+     * @throws Exception in case of failure
      */
     public void testitUseHttpProxyForWebDAV()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
index 84fc394..e40be87 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
@@ -177,6 +177,8 @@ public class MavenITmng3599useHttpProxyForWebDAVTest
 
     /**
      * Test that HTTP proxy is used for HTTP and for WebDAV.
+     *
+     * @throws Exception in case of failure
      */
     public void testitUseHttpProxyForWebDAV()
         throws Exception
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 5b79047..088a833 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
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 e15a686..090aaa7 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng3607ClassLoadersUseValidUrlsTest
 
     /**
      * Test that class loaders created by Maven employ valid URLs, e.g. properly encode characters like spaces.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 99adf5d..f4518ef 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3621UNCInheritedPathsTest
 
     /**
      * Verifies that UNC paths are inherited correctly.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3621()
         throws Exception
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 e6b179a..822f392 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
@@ -21,13 +21,12 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3642">MNG-3642</a>.
  *
- * @todo Fill in a better description of what this test verifies!
+ * todo Fill in a better description of what this test verifies!
  *
  * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
  * @author jdcasey
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 02c778d..eda57ab 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
@@ -19,8 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -28,7 +26,7 @@ import java.io.File;
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3645">MNG-3645</a>.
  *
- * @todo Fill in a better description of what this test verifies!
+ * todo Fill in a better description of what this test verifies!
  *
  * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
  * @author jdcasey
@@ -45,6 +43,8 @@ public class MavenITmng3645POMSyntaxErrorTest
 
     /**
      * Verify that POMs of reactor projects are parsed in strict mode.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 d5f392b..d25a041 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
@@ -34,8 +34,6 @@ import java.util.List;
 
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3652">MNG-3652</a>.
- *
- *
  */
 public class MavenITmng3652UserAgentHeaderTest
     extends AbstractMavenIntegrationTestCase
@@ -105,6 +103,8 @@ public class MavenITmng3652UserAgentHeaderTest
 
     /**
      * Test that the user agent header is configured in the wagon manager.
+     *
+     * @throws Exception in case of failure
      */
     public void testmng3652_UnConfiguredHttp()
         throws Exception
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 4b09cf6..ff7b0c0 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
@@ -22,7 +22,6 @@ package org.apache.maven.it;
 import java.io.File;
 import java.util.List;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -44,6 +43,8 @@ public class MavenITmng3667ResolveDepsWithBadPomVersionTest
     /**
      * Verify that dependency resolution gracefully ignores dependency POMs that have coordinates which don't
      * match the deployed artifact.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 3c4b2a3..f2e3378 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
@@ -21,7 +21,6 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
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 614925b..36ddf66 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
@@ -21,7 +21,6 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
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 ec43f08..cd5f106 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
@@ -22,7 +22,6 @@ package org.apache.maven.it;
 import java.io.File;
 import java.util.List;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -41,6 +40,8 @@ public class MavenITmng3680InvalidDependencyPOMTest
 
     /**
      * Verify that dependencies with invalid POMs can still be used without failing the build.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3680 ()
         throws Exception
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 ab1148a..3990403 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
@@ -21,7 +21,6 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
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 b6c838f..e1f1261 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
@@ -21,7 +21,6 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
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 30702bb..dfd10f5 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3701ImplicitProfileIdTest
     /**
      * Verify that profiles without explicit id get a default id and in particular don't cause NPEs when
      * they are active by default.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3701()
         throws Exception
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 66d7c27..00a3026 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
@@ -21,13 +21,13 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3703">MNG-3703</a>.
  *
- * @todo Fill in a better description of what this test verifies!
+ * todo Fill in a better description of what this test verifies!
+ *
  * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
  * @author jdcasey
  */
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3704LifecycleExecutorWrapperTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3704LifecycleExecutorWrapperTest.java
index 0909f6f..1b62dd1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3704LifecycleExecutorWrapperTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3704LifecycleExecutorWrapperTest.java
@@ -21,13 +21,12 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3704">MNG-3704</a>.
  *
- * @todo Fill in a better description of what this test verifies!
+ * todo Fill in a better description of what this test verifies!
  *
  * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
  * @author jdcasey
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 714b8d4..0e4bc69 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
@@ -28,9 +28,11 @@ import java.util.List;
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3710">MNG-3710</a>.
  *
+ * todo Fill in a better description of what this test verifies!
+ *
  * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
  * @author jdcasey
- * @todo Fill in a better description of what this test verifies!
+ *
  */
 public class MavenITmng3710PollutedClonedPluginsTest
     extends AbstractMavenIntegrationTestCase
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 a6182d9..c391bb8 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng3714ToolchainsCliOptionTest
 
     /**
      * Test --toolchains CLI option
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3714()
         throws Exception
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 f8d864f..179a7d8 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
@@ -21,13 +21,12 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3716">MNG-3716</a>.
  *
- * @todo Fill in a better description of what this test verifies!
+ * todo Fill in a better description of what this test verifies!
  *
  * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
  * @author jdcasey
@@ -41,7 +40,7 @@ public class MavenITmng3716AggregatorForkingTest
         super( "(2.0.8,)" ); // only test in 2.0.9+
     }
 
-    public void testitMNG3716 ()
+    public void testitMNG3716()
         throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3716" );
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 885c892..91f28d4 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
@@ -43,6 +43,8 @@ public class MavenITmng3719PomExecutionOrderingTest
 
     /**
      * Test that 3 executions are run in the correct order.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3719()
         throws Exception
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 3930d00..6152c27 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
@@ -21,7 +21,6 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
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 57e8daa..ee5410f 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
@@ -21,13 +21,12 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3724">MNG-3724</a>.
  *
- * @todo Fill in a better description of what this test verifies!
+ * todo Fill in a better description of what this test verifies!
  *
  * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
  * @author jdcasey
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 001e893..91684f9 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
@@ -21,17 +21,16 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3729">MNG-3729</a>.
- * <br/><br/>
+ * <p>
  * Complicated use case, but say
  * you have an aggregator plugin that forks a lifecycle, and this aggregator is bound to the main lifecycle in a
  * multimodule build. Further, say you call another plugin directly from the command line for this multimodule build,
  * which forks a new lifecycle (like assembly:assembly).
- * <br/><br/>
+ * </p>
  * When the directly invoked aggregator forks, it will force the
  * forked lifecycle phase to be run for each project in the reactor, regardless of whether this causes the bound
  * aggregator mojo to run multiple times. When the bound aggregator executes for the first project (this will be in an
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 b47f300..14c6624 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
@@ -32,7 +32,6 @@ import java.util.Properties;
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3732">MNG-3732</a>.
  *
  * @author Benjamin Bentmann
- *
  */
 public class MavenITmng3732ActiveProfilesTest
     extends AbstractMavenIntegrationTestCase
@@ -45,6 +44,8 @@ public class MavenITmng3732ActiveProfilesTest
 
     /**
      * Verify that MavenProject.getActiveProfiles() includes profiles from all sources.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3732()
         throws Exception
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 da83353..1a9990e 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
@@ -21,7 +21,6 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3743ForkWithPluginManagementTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3743ForkWithPluginManagementTest.java
index 5810a28..f99b0ef 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3743ForkWithPluginManagementTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3743ForkWithPluginManagementTest.java
@@ -21,13 +21,12 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3743">MNG-3743</a>.
  *
- * @todo Fill in a better description of what this test verifies!
+ * todo Fill in a better description of what this test verifies!
  *
  * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
  * @author jdcasey
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 44fe78e..c18bd79 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
@@ -21,13 +21,13 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3746">MNG-3746</a>.
  *
- * @todo Fill in a better description of what this test verifies!
+ * todo Fill in a better description of what this test verifies!
+ *
  * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
  * @author jdcasey
  */
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 40b950c..119945d 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
@@ -22,13 +22,12 @@ package org.apache.maven.it;
 import java.io.File;
 import java.util.Properties;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3747">MNG-3747</a>.
  *
- * @todo Fill in a better description of what this test verifies!
+ * todo Fill in a better description of what this test verifies!
  *
  * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
  * @author jdcasey
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 71f6faa..e86596e 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
@@ -22,8 +22,6 @@ package org.apache.maven.it;
 import java.io.File;
 import java.util.List;
 
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
index 35ce284..42ebab1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
@@ -22,7 +22,6 @@ package org.apache.maven.it;
 import java.io.File;
 import java.util.Properties;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
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 12537ae..e300ef2 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng3766ToolchainsFromExtensionTest
 
     /**
      * Test toolchain discovery from build extensions.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 e7e49d9..81674c6 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng3769ExclusionRelocatedTransdepsTest
 
     /**
      * Verify that dependency resolution considers dependency management also for relocated artifacts.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3769()
         throws Exception
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 33f7ceb..6f3473c 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
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 7a7bf90..fb32f66 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3796ClassImportInconsistencyTest
 
     /**
      * Verify that classes shared with the Maven core realm are properly imported into the plugin realm.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3796()
         throws Exception
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 dc496b4..a4cd542 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng3805ExtensionClassPathOrderingTest
     /**
      * Verify that the extension manager respects the ordering of the extension's dependencies when setting up the
      * class realm.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3805()
         throws Exception
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 b271650..65df2e6 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
@@ -41,6 +41,8 @@ public class MavenITmng3807PluginConfigExpressionEvaluationTest
     /**
      * Verify that plugin configurations are subject to the parameter expression evaluator, in particular composite
      * parameter types.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritenceOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritenceOrderingTest.java
index c04fc7a..f12ccd6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritenceOrderingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritenceOrderingTest.java
@@ -41,6 +41,8 @@ public class MavenITmng3808ReportInheritenceOrderingTest
 
     /**
      * Test that 3 executions are run in the correct order.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3808()
         throws Exception
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 6c8ed2f..46a1e82 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
@@ -21,7 +21,6 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
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 d9b2118..16ed98d 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3811ReportingPluginConfigurationInheritanceTest
 
     /**
      * Verifies that reporting configuration is inherited properly.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3811()
         throws Exception
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 5959835..581fec9 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3813PluginClassPathOrderingTest
 
     /**
      * Verify that the ordering of the plugin class path matches the ordering of the dependencies as given in the POM.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3813()
         throws Exception
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 c54e4bc..966157e 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng3814BogusProjectCycleTest
 
     /**
      * Verify that the reactor's project sorter considers artifact versions when checking for cycles.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3814()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java
index 66d26a5..bf36fb9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -44,6 +43,8 @@ public class MavenITmng3819PluginDepPlexusUtilsTest
      * Verify that plexus-utils:1.1 is present on plugin class path if plexus-utils is not explicitly declared in
      * plugin POM for backward-compat with Maven 2.0.5- (due to MNG-2892, plexus-utils is no longer part of the core
      * class realm in Maven 2.0.6+).
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3819()
         throws Exception
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 8108eea..5cc68ff 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3821EqualPluginExecIdsTest
     /**
      * Verify that using the same id for executions/reportsets of different plugins doesn't blow up the project
      * builder.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3821()
         throws Exception
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 d1ca24f..184fae2 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3822BasedirAlignedInterpolationTest
 
     /**
      * Verify that POM interpolation uses basedir-aligned build directories.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3822()
         throws Exception
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 f8be033..c7bf9a8 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3827PluginConfigTest
 
     /**
      * Verify that plain plugin configuration works correctly.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3827()
         throws Exception
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 ef228b0..7528f59 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3831PomInterpolationTest
 
     /**
      * Test that expressions of the form ${*} resolve correctly to POM values (ugly but real).
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3831()
         throws Exception
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 de74218..d50fcc7 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng3833PomInterpolationDataFlowChainTest
     /**
      * Test that POM interpolation fully interpolates all properties in data flow chain, i.e. where property
      * A depends on property B, and property B depends on property C and so on.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3833()
         throws Exception
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 fe94952..1ea3bb2 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3836PluginConfigInheritanceTest
 
     /**
      * Verify that sub modules can *override* inherited plugin configuration.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3836()
         throws Exception
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 b757459..8d9a405 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng3838EqualPluginDepsTest
 
     /**
      * Verify that using the same dependency for different plugins doesn't blow up the project builder.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3838()
         throws Exception
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 665df4d..db65dd2 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3839PomParsingCoalesceTextTest
 
     /**
      * Test that POM parsing properly coalesces text data.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3839()
         throws Exception
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 a56eaff..da40502 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
@@ -45,6 +45,8 @@ public class MavenITmng3843PomInheritanceTest
 
     /**
      * Test various inheritance scenarios.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3843()
         throws Exception
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 1a96698..cbee7d1 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3845LimitedPomInheritanceTest
 
     /**
      * Test that inheritance is all-or-nothing for certain sub-trees of the POM.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3845()
         throws Exception
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 51a1eda..6702109 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3846PomInheritanceUrlAdjustmentTest
 
     /**
      * Test that inheritance of certain URLs automatically appends the child's artifact id.
+     *
+     * @throws Exception in case of failure
      */
     public void testitOneParent()
         throws Exception
@@ -73,6 +74,8 @@ public class MavenITmng3846PomInheritanceUrlAdjustmentTest
     /**
      * Test that inheritance of certain URLs automatically appends the child's artifact id. In a deeper inheritance
      * hierarchy, this should contribute the artifact id of each parent that does not override the URLs.
+     *
+     * @throws Exception in case of failure
      */
     public void testitTwoParents()
         throws Exception
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 30093dd..26b4420 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng3852PluginConfigWithHeterogeneousListTest
     /**
      * Verify that list-valued plugin parameters respect the ordering of their elements as given in the POM, even
      * if these elements have different names.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3852()
         throws Exception
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 709ae48..0f71bf9 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -46,6 +45,8 @@ public class MavenITmng3853ProfileInjectedDistReposTest
      * this issue is not primarily about the effective model (which was correct for the original issue, i.e. reflected
      * the injected distributionManagement section) but whether the MavenProject wrapper around the model is in sync
      * with the model.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3853()
         throws Exception
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 baba323..7256be9 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
@@ -19,8 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.VerificationException;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +40,8 @@ public class MavenITmng3863AutoPluginGroupIdTest
 
     /**
      * Verify that the group id "org.apache.maven.plugins" is *not* automatically assumed for dependencies.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3853()
         throws Exception
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 7a7c6ee..f5830cf 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3864PerExecPluginConfigTest
 
     /**
      * Verify that plain per-execution plugin configuration works correctly.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3864()
         throws Exception
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 9fa5cdf..4c9fcb6 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng3866PluginConfigInheritanceTest
     /**
      * Verify that inheritance merges plugin definitions based on groupId:artifactId, i.e. plugin version is
      * irrelevant for merging.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3866()
         throws Exception
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 a326eec..e2b916a 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3872ProfileActivationInRelocatedPomTest
 
     /**
      * Verify that profiles are activated in relocated POMs.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 001a1db..cb22b60 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,8 +40,10 @@ public class MavenITmng3873MultipleExecutionGoalsTest
     }
 
     /**
-     * Test that all goals from a plugin execution are actually executed and not only one when no <pluginManagement>
+     * Test that all goals from a plugin execution are actually executed and not only one when no {@code <pluginManagement>}
      * is involved.
+     *
+     * @throws Exception in case of failure
      */
     public void testitWithoutPluginMngt()
         throws Exception
@@ -51,8 +52,10 @@ public class MavenITmng3873MultipleExecutionGoalsTest
     }
 
     /**
-     * Test that all goals from a plugin execution are actually executed and not only one when <pluginManagement>
+     * Test that all goals from a plugin execution are actually executed and not only one when {@code <pluginManagement>}
      * is involved.
+     *
+     * @throws Exception in case of failure
      */
     public void testitWithPluginMngt()
         throws Exception
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 b2dff04..2ce8200 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng3877BasedirAlignedModelTest
 
     /**
      * Verify that project directories are basedir aligned when inspected by plugins via the MavenProject instance.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3877()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java
index e04e8a3..7c14b99 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng3885UniqueVersionFromParentProfileTest
     /**
      * Test that uniqueVersion=false defined by a parent profile is effective for child modules when building
      * from the parent.
+     *
+     * @throws Exception in case of failure
      */
     public void testitNonUniqueVersionReactor()
         throws Exception
@@ -65,6 +66,8 @@ public class MavenITmng3885UniqueVersionFromParentProfileTest
     /**
      * Test that uniqueVersion=false defined by a parent profile is effective for child modules when building
      * the child in isolation.
+     *
+     * @throws Exception in case of failure
      */
     public void testitNonUniqueVersionStandalone()
         throws Exception
@@ -87,6 +90,8 @@ public class MavenITmng3885UniqueVersionFromParentProfileTest
     /**
      * Test that uniqueVersion=true defined by a parent profile is effective for child modules when building
      * from the parent.
+     *
+     * @throws Exception in case of failure
      */
     public void testitUniqueVersionReactor()
         throws Exception
@@ -110,6 +115,8 @@ public class MavenITmng3885UniqueVersionFromParentProfileTest
     /**
      * Test that uniqueVersion=true defined by a parent profile is effective for child modules when building
      * the child in isolation.
+     *
+     * @throws Exception in case of failure
      */
     public void testitUniqueVersionStandalone()
         throws Exception
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 1958cb3..54b115e 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,8 +41,10 @@ public class MavenITmng3886ExecutionGoalsOrderTest
     }
 
     /**
-     * Test that the goals from a plugin execution are executed in the order given by the POM when no <pluginManagement>
+     * Test that the goals from a plugin execution are executed in the order given by the POM when no {@code <pluginManagement>}
      * is involved.
+     *
+     * @throws Exception in case of failure
      */
     public void testitWithoutPluginMngt()
         throws Exception
@@ -52,8 +53,10 @@ public class MavenITmng3886ExecutionGoalsOrderTest
     }
 
     /**
-     * Test that the goals from a plugin execution are executed in the order given by the POM when <pluginManagement>
+     * Test that the goals from a plugin execution are executed in the order given by the POM when {@code <pluginManagement>}
      * is involved.
+     *
+     * @throws Exception in case of failure
      */
     public void testitWithPluginMngt()
         throws Exception
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 90016d9..6934c61 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,7 +42,9 @@ public class MavenITmng3887PluginExecutionOrderTest
 
     /**
      * Test that multiple plugin executions bound to the same phase are executed in the order given by the POM when no
-     * <pluginManagement> is involved.
+     * {@code <pluginManagement>} is involved.
+     *
+     * @throws Exception in case of failure
      */
     public void testitWithoutPluginMngt()
         throws Exception
@@ -53,7 +54,9 @@ public class MavenITmng3887PluginExecutionOrderTest
 
     /**
      * Test that multiple plugin executions bound to the same phase are executed in the order given by the POM when
-     * <pluginManagement> is involved.
+     * {@code <pluginManagement>} is involved.
+     *
+     * @throws Exception in case of failure
      */
     public void testitWithPluginMngt()
         throws Exception
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 9db3061..19c8961 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3890TransitiveDependencyScopeUpdateTest
     /**
      * Test that transitive dependencies whose scope has been updated from "compile" to "provided" by a consumer
      * remain in "provided" scope when depending on this consumer with scope "compile".
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3890()
         throws Exception
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 c04fef8..a11145b 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
@@ -43,6 +43,8 @@ public class MavenITmng3892ReleaseDeploymentTest
     /**
      * Test that a bunch of release artifacts can be deployed without the deployer erroneously complaining about
      * already deployed artifacts.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3892()
         throws Exception
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 326c0e5..9ada61f 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3899ExtensionInheritanceTest
 
     /**
      * Test that build extensions are properly merged during inheritance.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3899()
         throws Exception
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 20cb6f0..40a1122 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3900ProfilePropertiesInterpolationTest
 
     /**
      * Test that build properties defined via active profiles are used for interpolation.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3900()
         throws Exception
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 33f616f..7ddfa98 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng3904NestedBuildDirInterpolationTest
     /**
      * Test that properties which refer to build directories which in turn refer to other build directories are
      * properly interpolated.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3904()
         throws Exception
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 8ecbdfe..6a476f4 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3906MergedPluginClassPathOrderingTest
 
     /**
      * Test that project-level plugin dependencies are properly merged during inheritance.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3906()
         throws Exception
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 b688ce3..13607b5 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -45,6 +44,8 @@ public class MavenITmng3916PluginExecutionInheritanceTest
     /**
      * Test that plugin executions are properly merged during inheritance, even if the child plugin section has no
      * version.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3916()
         throws Exception
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 44bb11a..a31d9e4 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng3924XmlMarkupInterpolationTest
 
     /**
      * Test that interpolation of properties that resolve to XML markup doesn't crash the project builder.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3924()
         throws Exception
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 c6b4088..a13ac38 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,7 +42,9 @@ public class MavenITmng3925MergedPluginExecutionOrderTest
 
     /**
      * Test that multiple plugin executions bound to the same phase by child and parent are executed in the proper
-     * order when no <pluginManagement> is involved.
+     * order when no {@code <pluginManagement>} is involved.
+     *
+     * @throws Exception in case of failure
      */
     public void testitWithoutPluginMngt()
         throws Exception
@@ -53,7 +54,9 @@ public class MavenITmng3925MergedPluginExecutionOrderTest
 
     /**
      * Test that multiple plugin executions bound to the same phase by child and parent are executed in the proper
-     * order when <pluginManagement> is involved.
+     * order when {@code <pluginManagement>} is involved.
+     *
+     * @throws Exception in case of failure
      */
     public void testitWithPluginMngt()
         throws Exception
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 ca37d0d..01f641a 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3927PluginDefaultExecutionConfigTest
     /**
      * Test that the configuration for a plugin execution without an identifier does not pollute the configuration
      * of default plugin executions introduced by the packaging.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3927()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933ProfilesXmlActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933ProfilesXmlActivationTest.java
index 160813e..f538271 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933ProfilesXmlActivationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933ProfilesXmlActivationTest.java
@@ -45,6 +45,8 @@ public class MavenITmng3933ProfilesXmlActivationTest
     /**
      * Test that profiles from an external profiles.xml are properly activated. This is really a different story
      * than profiles in the settings.xml or the POM.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3933()
         throws Exception
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 86e7810..e6b8a8f 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,7 +42,9 @@ public class MavenITmng3937MergedPluginExecutionGoalsTest
 
     /**
      * Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly
-     * ordered when no <pluginManagement> is involved.
+     * ordered when no {@code <pluginManagement>} is involved.
+     *
+     * @throws Exception in case of failure
      */
     public void testitWithoutPluginMngt()
         throws Exception
@@ -53,7 +54,9 @@ public class MavenITmng3937MergedPluginExecutionGoalsTest
 
     /**
      * Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly
-     * ordered when <pluginManagement> is involved.
+     * ordered when {@code <pluginManagement>} is involved.
+     *
+     * @throws Exception in case of failure
      */
     public void testitWithPluginMngt()
         throws Exception
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 df85c97..0f67e4b 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -44,7 +43,9 @@ public class MavenITmng3938MergePluginExecutionsTest
     /**
      * Test that plugin executions with the same id are merged during inheritance, especially executions using the
      * default id, regardless whether the id is given explicitly by the user or implicitly assumed from defaults, when
-     * no <pluginManagement> is involved.
+     * no {@code <pluginManagement>} is involved.
+     *
+     * @throws Exception in case of failure
      */
     public void testitWithoutPluginMngt()
         throws Exception
@@ -55,7 +56,9 @@ public class MavenITmng3938MergePluginExecutionsTest
     /**
      * Test that plugin executions with the same id are merged during inheritance, especially executions using the
      * default id, regardless whether the id is given explicitly by the user or implicitly assumed from defaults, when
-     * <pluginManagement> is involved.
+     * {@code <pluginManagement>} is involved.
+     *
+     * @throws Exception in case of failure
      */
     public void testitWithPluginMngt()
         throws Exception
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 4859749..7c36284 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
@@ -45,6 +45,8 @@ public class MavenITmng3940EnvVarInterpolationTest
     /**
      * Test that interpolation of environment variables respects the casing rules of the underlying OS (especially
      * Windows).
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3940()
         throws Exception
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 2146697..8454fce 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
@@ -22,7 +22,6 @@ package org.apache.maven.it;
 import java.io.File;
 import java.util.Properties;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -43,6 +42,8 @@ public class MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest
      * Test that the execution project from a forked lifecycle does not leak into mojos that run after the mojo
      * that forked the lifecycle. While this is rather irrelevant for Maven's core itself, this enforces proper
      * mojo programming, i.e. a mojo should not access the execution project unless it forked the lifecycle.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 d9755d9..b8ddf09 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -45,6 +44,8 @@ public class MavenITmng3943PluginExecutionInheritanceTest
     /**
      * Test that plugin executions are properly merged during inheritance, even if the child uses a different
      * plugin version than the parent.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3943()
         throws Exception
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 5c8b6f1..f48399d 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
@@ -41,6 +41,8 @@ public class MavenITmng3944BasedirInterpolationTest
 
     /**
      * Test that interpolation of ${basedir} works for a POM that is not named "pom.xml"
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3944()
         throws Exception
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 50da9d2..00c5aed 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3947PluginDefaultExecutionConfigTest
     /**
      * Test that the configuration for a plugin execution with the identifier "default" does not pollute the
      * configuration of standalone plugin executions from the CLI.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3947()
         throws Exception
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 3eb7993..b8fc38f 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng3948ParentResolutionFromProfileReposTest
 
     /**
      * Test that parent POMs can be resolved from remote repositories defined by (active) profiles in profiles.xml.
+     *
+     * @throws Exception in case of failure
      */
     public void testitFromProfilesXml()
         throws Exception
@@ -63,6 +64,8 @@ public class MavenITmng3948ParentResolutionFromProfileReposTest
 
     /**
      * Test that parent POMs can be resolved from remote repositories defined by (active) profiles in the POM.
+     *
+     * @throws Exception in case of failure
      */
     public void testitFromPom()
         throws Exception
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 5d801c6..9aacce1 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
@@ -42,6 +42,8 @@ public class MavenITmng3951AbsolutePathsTest
     /**
      * Test that the paths retrieved from the core are always absolute, in particular the drive-relative paths on
      * Windows must be properly resolved.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3951()
         throws Exception
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 2ead5c4..b2013df 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
@@ -134,6 +134,8 @@ public class MavenITmng3953AuthenticatedDeploymentTest
 
     /**
      * Test that deployment (of a release) to a repository that requires authentification works.
+     *
+     * @throws Exception in case of failure
      */
     public void testitRelease()
         throws Exception
@@ -143,6 +145,8 @@ public class MavenITmng3953AuthenticatedDeploymentTest
 
     /**
      * Test that deployment (of a snapshot) to a repository that requires authentification works.
+     *
+     * @throws Exception in case of failure
      */
     public void testitSnapshot()
         throws Exception
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 8891254..b5b6c40 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
@@ -22,7 +22,6 @@ package org.apache.maven.it;
 import java.io.File;
 import java.util.Properties;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -43,6 +42,8 @@ public class MavenITmng3955EffectiveSettingsTest
     /**
      * Test that plugin parameter expressions referring to the settings reflect the actual core state, especially
      * if settings have been overridden by CLI parameters.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3955()
         throws Exception
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 56c1f5b..08aadc4 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng3970DepResolutionFromProfileReposTest
 
     /**
      * Test that dependencies can be resolved from remote repositories defined by (active) profiles in profiles.xml.
+     *
+     * @throws Exception in case of failure
      */
     public void testitFromProfilesXml()
         throws Exception
@@ -63,6 +64,8 @@ public class MavenITmng3970DepResolutionFromProfileReposTest
 
     /**
      * Test that dependencies can be resolved from remote repositories defined by (active) profiles in the POM.
+     *
+     * @throws Exception in case of failure
      */
     public void testitFromPom()
         throws Exception
@@ -84,6 +87,8 @@ public class MavenITmng3970DepResolutionFromProfileReposTest
 
     /**
      * Test that dependencies can be resolved from remote repositories defined by (active) profiles in settings.xml.
+     *
+     * @throws Exception in case of failure
      */
     public void testitFromSettings()
         throws Exception
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 bc2e70d..6c99d2b 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng3974MirrorOrderingTest
     /**
      * Test that mirror definitions are properly evaluated. In particular, the first matching mirror definition
      * from the settings should win, i.e. ordering of mirror definitions matters.
+     *
+     * @throws Exception in case of failure
      */
     public void testitFirstMatchWins()
         throws Exception
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 cd40160..cf27f19 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
@@ -21,7 +21,6 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -42,6 +41,8 @@ public class MavenITmng3979ElementJoinTest
     /**
      * Test that during inheritance the merging/joining of sub trees with equal identifier doesn't crash if the parent
      * POM has a non-empty element and the child POM has an empty element to join.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3979()
         throws Exception
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 da5ce00..50e1dbd 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng3983PluginResolutionFromProfileReposTest
 
     /**
      * Test that plugins can be resolved from remote plugin repositories defined by (active) profiles in the POM.
+     *
+     * @throws Exception in case of failure
      */
     public void testitFromPom()
         throws Exception
@@ -64,6 +65,8 @@ public class MavenITmng3983PluginResolutionFromProfileReposTest
 
     /**
      * Test that plugins can be resolved from remote plugin repositories defined by (active) profiles in profiles.xml.
+     *
+     * @throws Exception in case of failure
      */
     public void testitFromProfilesXml()
         throws Exception
@@ -88,6 +91,8 @@ public class MavenITmng3983PluginResolutionFromProfileReposTest
 
     /**
      * Test that plugins can be resolved from remote plugin repositories defined by (active) profiles in settings.xml.
+     *
+     * @throws Exception in case of failure
      */
     public void testitFromSettings()
         throws Exception
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 1f60b58..24c6b90 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng3991ValidDependencyScopeTest
 
     /**
      * Test that invalid dependency scopes cause a validation error during building.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 89174d6..fd8a8df 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -44,6 +43,8 @@ public class MavenITmng3998PluginExecutionConfigTest
 
     /**
      * Test that multiple plugin executions do not lose their configuration when plugin management is used.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG3998()
         throws Exception
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 4dd843d..575d25a 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,8 +41,10 @@ public class MavenITmng4000MultiPluginExecutionsTest
     }
 
     /**
-     * Test that plugin executions without id are not lost among other plugin executions when no <pluginManagement>
+     * Test that plugin executions without id are not lost among other plugin executions when no {@code <pluginManagement>}
      * is present.
+     *
+     * @throws Exception in case of failure
      */
     public void testitWithoutPluginMngt()
         throws Exception
@@ -63,8 +64,10 @@ public class MavenITmng4000MultiPluginExecutionsTest
     }
 
     /**
-     * Test that plugin executions without id are not lost among other plugin executions when <pluginManagement>
+     * Test that plugin executions without id are not lost among other plugin executions when {@code <pluginManagement>}
      * is present.
+     *
+     * @throws Exception in case of failure
      */
     public void testitWithPluginMngt()
         throws Exception
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 56d97c4..abbb87b 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng4005UniqueDependencyKeyTest
 
     /**
      * Test that duplicate dependencies cause a validation error during building.
+     *
+     * @throws Exception in case of failure
      */
     public void testitDependency()
         throws Exception
@@ -50,6 +51,8 @@ public class MavenITmng4005UniqueDependencyKeyTest
 
     /**
      * Test that duplicate managed dependencies cause a validation error during building.
+     *
+     * @throws Exception in case of failure
      */
     public void testitManagedDependency()
         throws Exception
@@ -59,6 +62,8 @@ public class MavenITmng4005UniqueDependencyKeyTest
 
     /**
      * Test that duplicate dependencies in profiles cause a validation error during building.
+     *
+     * @throws Exception in case of failure
      */
     public void testitProfileDependency()
         throws Exception
@@ -68,6 +73,8 @@ public class MavenITmng4005UniqueDependencyKeyTest
 
     /**
      * Test that duplicate managed dependencies in profiles cause a validation error during building.
+     *
+     * @throws Exception in case of failure
      */
     public void testitProfileManagedDependency()
         throws Exception
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 6d086c0..278e155 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4007PlatformFileSeparatorTest
 
     /**
      * Verify that paths to project directories use the platform-specific file separator.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG4007()
         throws Exception
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 bac91ea..26ae4a1 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4008MergedFilterOrderTest
 
     /**
      * Verify that filter definitions are properly merged.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG4008()
         throws Exception
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 18bfc6b..32a49b3 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4009InheritProfileEffectsTest
 
     /**
      * Verify that the effects of profiles on a parent are inherited by children.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG4009()
         throws Exception
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 fb18806..a575084 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng4016PrefixedPropertyInterpolationTest
     /**
      * Test that expressions with the special prefixes "project.", "pom." and "env." can be interpolated from
      * properties that include the prefix.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG4016()
         throws Exception
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 09f8c32..b6f7006 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4022IdempotentPluginConfigMergingTest
     /**
      * Test that merging of equal plugin configuration is idempotent. This is especially interesting for lists with
      * empty elements.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 ece6ddc..019b8f6 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -44,6 +43,8 @@ public class MavenITmng4023ParentProfileOneTimeInjectionTest
      * Verify that profiles in a parent are only injected once during a reactor build that include the parent
      * itself. The parent being part of the reactor makes it subject to project caching and proper use of the
      * cache is crucial here.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG4023()
         throws Exception
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 bd9deca..43da113 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -44,6 +43,8 @@ public class MavenITmng4026ReactorDependenciesOrderTest
     /**
      * Verify that the project class path is properly ordered during a reactor build, i.e. when dependencies are
      * resolved as active project artifacts from the reactor.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG4026()
         throws Exception
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 b6a99f6..74f5314 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -45,6 +44,8 @@ public class MavenITmng4034ManagedProfileDependencyTest
     /**
      * Verify that dependencies defined in profiles get their version injected from the dependency management of the
      * parent.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG4034()
         throws Exception
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 8c497eb..2abef36 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng4036ParentResolutionFromSettingsRepoTest
 
     /**
      * Verify that a parent POM is downloaded from a default-style remote repo defined in the settings.
+     *
+     * @throws Exception in case of failure
      */
     public void testitDefaultLayout()
         throws Exception
@@ -61,6 +62,8 @@ public class MavenITmng4036ParentResolutionFromSettingsRepoTest
 
     /**
      * Verify that a parent POM is downloaded from a legacy-style remote repo defined in the settings.
+     *
+     * @throws Exception in case of failure
      */
     public void testitLegacyLayout()
         throws Exception
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 8302c92..bba040d 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng4040ProfileInjectedModulesTest
 
     /**
      * Verify that modules inside profiles are not accidentally inherited by the children.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 1bdb0b4..53fd658 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng4048VersionRangeReactorResolutionTest
 
     /**
      * Verify that dependencies using version ranges can be resolved from the reactor.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 0e1b73e..ae8a207 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
@@ -42,6 +42,8 @@ public class MavenITmng4052ReactorAwareImportScopeTest
      * like a POM that imports another POM. To clarify, this is not about the kind of dependency where one
      * project needs another project's output for compilation/testing but about the case where one project's
      * effective model requires another project's model for its construction.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 35ad20a..7233fd3 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4053PluginConfigAttributesTest
     /**
      * Verify that attributes in plugin configuration elements are not erroneously duplicated to other elements when
      * no plugin management is used.
+     *
+     * @throws Exception in case of failure
      */
     public void testitWithoutPluginMngt()
         throws Exception
@@ -52,6 +53,8 @@ public class MavenITmng4053PluginConfigAttributesTest
     /**
      * Verify that attributes in plugin configuration elements are not erroneously duplicated to other elements when
      * plugin management is used.
+     *
+     * @throws Exception in case of failure
      */
     public void testitWithPluginMngt()
         throws Exception
@@ -62,6 +65,8 @@ public class MavenITmng4053PluginConfigAttributesTest
     /**
      * Verify that attributes in plugin configuration elements are not erroneously duplicated to other elements when
      * plugin management and a profile are used.
+     *
+     * @throws Exception in case of failure
      */
     public void testitWithPluginMngtAndProfile()
         throws Exception
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 837472d..6991e49 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4056ClassifierBasedDepResolutionFromReactorTest
     /**
      * Test that attached artifacts can be resolved from the reactor cache even if the dependency declaration
      * in the consumer module does not use the proper artifact type but merely specifies the classifier.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 c0905d2..7683c89 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
@@ -117,6 +117,8 @@ public class MavenITmng4068AuthenticatedMirrorTest
     /**
      * Test that downloading of release/snapshot artifacts from an authenticated mirror works. This basically boils down
      * to using the proper id for the mirrored repository when looking up the credentials.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 0cdd30a..1f0dd7a 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4070WhitespaceTrimmingTest
 
     /**
      * Test that whitespace around artifact coordinates does not change artifact identity.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 ab5e598..39754fa 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng4072InactiveProfileReposTest
 
     /**
      * Test that repositories from inactive profiles are actually not used for artifact resolution.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java
index 25cbef6..dc3c86b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4086ExplicitPluginMetaversionTest
     /**
      * Verify that the plugin metaversion RELEASE can be explicitly used and especially is resolved
      * to a proper version before the plugin manager creates the key for the plugin realm.
+     *
+     * @throws Exception in case of failure
      */
     public void testitRelease()
         throws Exception
@@ -67,6 +68,8 @@ public class MavenITmng4086ExplicitPluginMetaversionTest
     /**
      * Verify that the plugin metaversion LATEST can be explicitly used and especially is resolved
      * to a proper version before the plugin manager creates the key for the plugin realm.
+     *
+     * @throws Exception in case of failure
      */
     public void testitLatest()
         throws Exception
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 d29e21e..1910e3d 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng4087PercentEncodedFileUrlTest
 
     /**
      * Test that deployment to a file:// repository decodes percent-encoded characters.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 c11ed15..50b7367 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -44,6 +43,8 @@ public class MavenITmng4102InheritedPropertyInterpolationTest
      * Verify that the effective value of an inherited property reflects the values of any nested property
      * as defined by the child. This boils down to the order of inheritance and (parent) interpolation.
      * This variation of the test has no profiles.
+     *
+     * @throws Exception in case of failure
      */
     public void testitNoProfiles()
         throws Exception
@@ -56,6 +57,8 @@ public class MavenITmng4102InheritedPropertyInterpolationTest
      * as defined by the child. This boils down to the order of inheritance and (parent) interpolation.
      * This variation of the test has active profiles in parent and child (which should make no difference
      * to the result).
+     *
+     * @throws Exception in case of failure
      */
     public void testitActiveProfiles()
         throws Exception
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 28a4afe..61e1c1c 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
@@ -22,7 +22,6 @@ package org.apache.maven.it;
 import java.io.File;
 import java.util.Properties;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -44,6 +43,8 @@ public class MavenITmng4106InterpolationUsesDominantProfileTest
      * Test that interpolation uses the property values from the dominant (i.e. last) profile among a group
      * of active profiles that define the same properties. This boils down to the proper order of profile
      * injection and interpolation, i.e. interpolate after all profiles are injected.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG4106()
         throws Exception
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 0d0134d..74d30f2 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
@@ -22,7 +22,6 @@ package org.apache.maven.it;
 import java.io.File;
 import java.util.Properties;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -44,6 +43,8 @@ public class MavenITmng4107InterpolationUsesDominantProfileSourceTest
      * Test that POM interpolation uses the property values from the dominant profile source (POM vs. profiles.xml
      * vs. settings.xml). This boils down to the proper order of profile injection and interpolation, i.e.
      * interpolate after profiles from all sources are injected.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG4107()
         throws Exception
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 7633c16..cf893db 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -36,6 +35,8 @@ public class MavenITmng4112MavenVersionPropertyTest
 
     /**
      * Test for ${maven.version} and ${maven.build.version} property
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 c1b5cb0..0b1f703 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
@@ -22,7 +22,6 @@ package org.apache.maven.it;
 import java.io.File;
 import java.util.Properties;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -42,6 +41,8 @@ public class MavenITmng4116UndecodedUrlsTest
 
     /**
      * Test that the project builder does not decode URLs (which must be done by the transport layer instead).
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG4116()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4126ParentProfilesXmlTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4126ParentProfilesXmlTest.java
index 62788f3..f0d4896 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4126ParentProfilesXmlTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4126ParentProfilesXmlTest.java
@@ -22,7 +22,6 @@ package org.apache.maven.it;
 import java.io.File;
 import java.util.Properties;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -45,6 +44,8 @@ public class MavenITmng4126ParentProfilesXmlTest
      * Verify that effects of active profiles from the profiles.xml of a local parent are inherited by children when
      * parent and child are build together during a reactor invocation. This boils down to the reactor cache not
      * interfering with profile injection from profiles.xml by properly tracking the base directory of cached projects.
+     *
+     * @throws Exception in case of failure
      */
     public void testitReactorBuild()
         throws Exception
@@ -66,6 +67,8 @@ public class MavenITmng4126ParentProfilesXmlTest
      * Verify that effects of active profiles from the profiles.xml of a local parent are inherited by children when
      * parent and child are build together during a reactor invocation. This boils down to the reactor cache not
      * interfering with profile injection from profiles.xml by properly tracking the base directory of cached projects.
+     *
+     * @throws Exception in case of failure
      */
     public void testitChildOnlyBuild()
         throws Exception
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 f4d7b94..8181151 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
@@ -24,7 +24,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -44,6 +43,8 @@ public class MavenITmng4129PluginExecutionInheritanceTest
 
     /**
      * Verify that plugin executions defined in the parent with inherited=false are not executed in child modules.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java
index cd93ba2..184bfe0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java
@@ -42,6 +42,8 @@ public class MavenITmng4148DepPomInterpWithSettingsProfilesTest
      * Test that a property from the settings profile that used in the
      * version for a dependency is interpolated when the spec is a transitive dependency
      * (declared in the POM of a direct dependency of the current project).
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 128a3aa..8068af2 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng4150VersionRangeTest
 
     /**
      * Test version range support.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG4150()
         throws Exception
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 4de13e3..d655458 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4162ReportingMigrationTest
     /**
      * Verify that the legacy reporting section is automatically converted into ordinary plugin configuration of the
      * Maven Site Plugin to ease migration.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 6812a03..2a29ffc 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng4166HideCoreCommonsCliTest
     /**
      * Verify that plugins can use their own version of commons-cli and are not bound to the version bundled in the
      * core.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMNG4166()
         throws Exception
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 f941928..bcace82 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4172EmptyDependencySetTest
 
     /**
      * Test that a project without dependencies is really constructed without dependency artifacts.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 984e918..ae58d43 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
@@ -43,6 +43,8 @@ public class MavenITmng4180PerDependencyExclusionsTest
     /**
      * Test that dependency exclusions are not applied globally but are limited to the sub tree that is rooted at the
      * dependency they are declared on.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 5249d8f..e8db236 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
@@ -45,6 +45,8 @@ public class MavenITmng4190MirrorRepoMergingTest
      * Test that artifact repositories are merged if they are mirrored by the same repo. If n repos map to one
      * mirror, there is no point in making n trips to the same mirror. However, the effective/merged repo needs
      * to account for possibly different policies of the original repos.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 bcafe5b..f8e1f05 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng4193UniqueRepoIdTest
 
     /**
      * Test that duplicate repository id cause a validation error during building.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 499b8c3..0e91c02 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4196ExclusionOnPluginDepTest
 
     /**
      * Verify that exclusions on a project-level plugin dependency are effective.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 e705e3e..ff0476a 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -49,6 +48,8 @@ public class MavenITmng4199CompileMeetsRuntimeScopeTest
      * Test that the core properly handles goals with different requirements on dependency resolution. In particular
      * verify that the different dependency scopes are not erroneously collapsed/combined into just a single scope.
      * The problem is that scope "runtime" is not a superset of scope "compile".
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 0d7c704..e8629e6 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
@@ -42,6 +42,8 @@ public class MavenITmng4203TransitiveDependencyExclusionTest
 
     /**
      * Test that exclusions defined on a dependency apply to its transitive dependencies as well.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 f89eabc..40a92b3 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
@@ -40,6 +40,8 @@ public class MavenITmng4207PluginWithLog4JTest
     /**
      * Test that a plugin that depends on log4j and employes the artifact resolver does not die when using
      * commons-http to resolve an artifact.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 7800767..58bd1c3 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng4208InterpolationPrefersCliOverProjectPropsTest
 
     /**
      * Test that exclusions defined on a dependency apply to its transitive dependencies as well.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 71ba631..6dccc48 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4214MirroredParentSearchReposTest
      * Test parent POMs can be resolved from repos with different enabled policies that are matched by a single mirror.
      * In other words, check that the one mirror is properly configured with a merged view of the potentially different
      * policies from the original repos.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 7deb94c..83be45e 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng4231SnapshotUpdatePolicyTest
 
     /**
      * Test the update policy "always" for snapshot dependencies is respected.
+     *
+     * @throws Exception in case of failure
      */
     public void testitAlways()
         throws Exception
@@ -78,6 +79,8 @@ public class MavenITmng4231SnapshotUpdatePolicyTest
 
     /**
      * Test the update policy "never" for snapshot dependencies is respected.
+     *
+     * @throws Exception in case of failure
      */
     public void testitNever()
         throws Exception
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 689e190..e76736d 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
@@ -43,6 +43,8 @@ public class MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest
      * from the reactor. This case is a subtle variation of MNG-2877, namely not using @requiresDependencyResolution
      * or artifact instances created by the Maven core. In short, reactor resolution should work for any artifact,
      * regardless whether created by the core or a plugin.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 6f726a5..62903fe 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
@@ -131,6 +131,8 @@ public class MavenITmng4235HttpAuthDeploymentChecksumsTest
      * that it might require double submission of the data, first during an initial PUT without credentials and second
      * during a retried PUT with credentials in response to the auth challenge by the server. The checksum must
      * nevertheless only be calculated on the non-doubled data stream.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 3fa300e..a4016b9 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
@@ -46,6 +46,8 @@ public class MavenITmng4262MakeLikeReactorDottedPath370Test
 
     /**
      * Verify that the project list can select the root project by its relative path ".".
+     *
+     * @throws Exception in case of failure
      */
     public void testitMakeRoot()
         throws Exception
@@ -67,7 +69,9 @@ public class MavenITmng4262MakeLikeReactorDottedPath370Test
     }
 
     /**
-     * Verify that the project list can select a sub module by a relative path like "../<something>".
+     * Verify that the project list can select a sub module by a relative path like {@code "../<something>"}.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMakeModule()
         throws Exception
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 d13cb91..0b2430e 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
@@ -21,7 +21,6 @@ package org.apache.maven.it;
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 /**
@@ -47,6 +46,8 @@ public class MavenITmng4262MakeLikeReactorDottedPathTest
 
     /**
      * Verify that the project list can select the root project by its relative path ".".
+     *
+     * @throws Exception in case of failure
      */
     public void testitMakeRoot()
         throws Exception
@@ -68,7 +69,9 @@ public class MavenITmng4262MakeLikeReactorDottedPathTest
     }
 
     /**
-     * Verify that the project list can select a sub module by a relative path like "../<something>".
+     * Verify that the project list can select a sub module by a relative path like {@code "../<something>"}.
+     *
+     * @throws Exception in case of failure
      */
     public void testitMakeModule()
         throws Exception
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 fa94106..d267451 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -44,6 +43,8 @@ public class MavenITmng4269BadReactorResolutionFromOutDirTest
      * problem is that the mere existence of a project output directory like target/classes is no sufficient indicator
      * that we can use that for artifact resolution. The project's output directory might just be a left over from a
      * previous build and could be in any state, e.g. incomplete.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 182ca11..d8be4f5 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -44,6 +43,8 @@ public class MavenITmng4273RestrictedCoreRealmAccessForPluginTest
      * Otherwise, we risk linkage errors when a plugin creates a custom class loader with parent-first delegation on
      * top of the plugin realm because the custom class loader will prefer potentially incompatible classes from the
      * core realm over classes from itself.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 3915568..d027d86 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng4274PluginRealmArtifactsTest
      * Verify that plugins with an undeclared dependency on plexus-utils that is brought in as a transitive dependency
      * of some Maven core artifact get the proper version of plexus-utils. For clarity, the proper version is the
      * version that the original core artifact specified as dependency, not the version shipped with the current core.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 3584710..974d192 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
@@ -40,6 +40,8 @@ public class MavenITmng4275RelocationWarningTest
 
     /**
      * Verify that relocations are logged (at warning level).
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 4904765..75c904a 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4276WrongTransitivePlexusUtilsTest
     /**
      * Verify that plugins that have a *transitive* dependency on plexus-utils:x.y get that version and not a random
      * version injected by the core like 1.1.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java
index aa1f7e4..3305a4b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java
@@ -40,6 +40,8 @@ public class MavenITmng4279WagonProviderFailoverTest
     /**
      * Test that wagon provider selection fails gracefully and uses protocol for roleHint if protocol-provider roleHint
      * isn't available.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 b05b15f..a4b6f58 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng4281PreferLocalSnapshotTest
 
     /**
      * Test that remote snapshots are not preferred over snapshots that have just been locally built.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 985164b..2f553a1 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng4283ParentPomPackagingTest
 
     /**
      * Test that the model builder fails when a parent POM has not "pom" packaging.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 77d277c..9dacd0d 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng4291MojoRequiresOnlineModeTest
     /**
      * Test that the mojo annotation @requiresOnline is recognized. For a direct mojo invocation, this means to fail
      * when Maven is in offline mode but the mojo requires online model.
+     *
+     * @throws Exception in case of failure
      */
     public void testitDirectInvocation()
         throws Exception
@@ -71,6 +72,8 @@ public class MavenITmng4291MojoRequiresOnlineModeTest
     /**
      * Test that the mojo annotation @requiresOnline is recognized. For a mojo invocation bound to a lifecycle phase,
      * this means to skip the mojo when Maven is in offline mode but the mojo requires online mode.
+     *
+     * @throws Exception in case of failure
      */
     public void testitLifecycleInvocation()
         throws Exception
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 8b1ef7f..7a1eb77 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng4292EnumTypeMojoParametersTest
 
     /**
      * Test that mojo parameters can be configured with enums.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 b655869..0626797 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -46,6 +45,8 @@ public class MavenITmng4293RequiresCompilePlusRuntimeScopeTest
 
     /**
      * Test support of "@requiresDependencyResolution compile+runtime".
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 8b6d4f2..ae2d7ab 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4304ProjectDependencyArtifactsTest
     /**
      * Verify that MavenProject.getDependencyArtifacts() is properly populated with the direct artifacts of the
      * project.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 ee2d9cd..c6d6d3a 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4305LocalRepoBasedirTest
     /**
      * Verify that ${localRepository.basedir} delivers a proper filesystem path. In detail, the path should use the
      * platform-specific file separator and have no trailing separator.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 a38829e..43cb67c 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
@@ -41,6 +41,8 @@ public class MavenITmng4309StrictChecksumValidationForMetadataTest
     /**
      * Verify that strict checksum verification applies to metadata as well and in particular fails the build
      * during deployment when the previous metadata is corrupt.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 37ab085..188015e 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest
      * Verify that plugins that use magic parameter expressions like ${plugin} for ordinary system properties
      * get properly configured and don't crash due to Maven trying to inject a type-incompatible magic value
      * into the String-type mojo parameter.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 f91832f..aca8afd 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng4314DirectInvocationOfAggregatorTest
 
     /**
      * Verify that aggregator mojos invoked from the CLI run only once, namely at the top-level project.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 1fe61ee..42abe8f 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng4317PluginVersionResolutionFromMultiReposTest
     /**
      * Verify that the g:a level metadata files from different repositories are properly merged when trying to resolve
      * a version for some plugin that was invoked with g:a:goal.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 4275154..91c79ae 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4318ProjectExecutionRootTest
 
     /**
      * Verify that MavenProject.isExecutionRoot() is properly set within a reactor.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 a3f0c5c..58cb6e6 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng4319PluginExecutionGoalInterpolationTest
 
     /**
      * Test that goals in plugin executions can be interpolated.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 bafe2bf..9f3cb1e 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4320AggregatorAndDependenciesTest
     /**
      * Verify that for aggregator mojos invoked from the CLI that require dependency resolution the dependencies
      * of all projects in the reactor are resolved and not only the dependencies of the top-level project.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 9cabb7c..7e0c7fd 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4321CliUsesPluginMgmtConfigTest
      * Test that configuration from plugin management also applies to goals that are invoked directly from the
      * CLI even when the invoked plugin is neither explicitly present in the build/plugins section nor part of
      * the lifecycle mappings for the project's packaging.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 8c21c95..43fed13 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
@@ -53,7 +53,9 @@ public class MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest
 
     /**
      * Verify that locally built/installed snapshot artifacts suppress remote update checks (as long as the local copy
-     * still satifies the update policy configured for the remote repository).
+     * still satisfies the update policy configured for the remote repository).
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 777f0ac..d203fef 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest
     /**
      * Verify that lifecycle forking mojos are excluded from the lifecycles that have directly or indirectly forked
      * by them.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 653eadc..a02d457 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng4328PrimitiveMojoParameterConfigurationTest
      * Verify that plugin parameters that are of primitive types like boolean (not java.lang.Boolean) can be populated
      * from expressions. In other words, the subtle difference between the runtime type of the expression value (which
      * will always be a primitive wrapper class due to reflection) and the actual parameter type should not matter.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 bad9716..18855fe 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng4331DependencyCollectionTest
      * Test that @requiresDependencyCollection works for a goal that is bound into a very early lifecycle phase
      * like "validate" where none of the reactor projects have an artifact file. The Enforcer Plugin is the
      * real world example for this use case.
+     *
+     * @throws Exception in case of failure
      */
     public void testitEarlyLifecyclePhase()
         throws Exception
@@ -66,6 +67,8 @@ public class MavenITmng4331DependencyCollectionTest
     /**
      * Test that @requiresDependencyCollection works for an aggregator goal that is invoked from the command line.
      * The Release Plugin is the real world example for this use case.
+     *
+     * @throws Exception in case of failure
      */
     public void testitCliAggregator()
         throws Exception
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 a365e43..e799686 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -44,6 +43,8 @@ public class MavenITmng4332DefaultPluginExecutionOrderTest
      * Verify that default plugin executions contributed by the packaging are executed before user-defined
      * executions from the POM's build section, regardless whether the executions are defined in the regular
      * plugins section or the plugin management section.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 cf4e3e3..02e7b56 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng4335SettingsOfflineModeTest
 
     /**
      * Test that offline mode is enabled when specified in the settings.xml
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 848cf57..70cea39 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -39,8 +38,10 @@ public class MavenITmng4338OptionalMojosTest
     }
 
     /**
-     * Test that the <optional-mojos> element in custom lifecycle mappings is recognized and does not cause
+     * Test that the {@code <optional-mojos>} element in custom lifecycle mappings is recognized and does not cause
      * a configuration failure when loading the lifecycle.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 d3dea0c..fd553af 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng4341PluginExecutionOrderTest
     /**
      * Test that plugins bound to the same phase get executed in POM order even if one of the plugins participates
      * in the default lifecycle bindings for the project's packaging.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 7fe5ad9..9fa058f 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4342IndependentMojoParameterDefaultValuesTest
     /**
      * Test that multiple goals within a single execution get their default configuration properly injected. In
      * particular, the default values for one goal should not influence the default values of the other goal.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 4107145..f2c16ce 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
@@ -140,6 +140,8 @@ public class MavenITmng4343MissingReleaseUpdatePolicyTest
     /**
      * Verify that checking for *missing* release artifacts respects the update policy that is configured in the
      * release section for the respective repository, in this case "always".
+     *
+     * @throws Exception in case of failure
      */
     public void testitAlways()
         throws Exception
@@ -192,6 +194,8 @@ public class MavenITmng4343MissingReleaseUpdatePolicyTest
     /**
      * Verify that checking for *missing* release artifacts respects the update policy that is configured in the
      * release section for the respective repository, in this case "never", unless overriden from the CLI via -U.
+     *
+     * @throws Exception in case of failure
      */
     public void testitNever()
         throws Exception
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 894cbaf..9ee1b86 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -44,6 +43,8 @@ public class MavenITmng4344ManagedPluginExecutionOrderTest
      * Test that custom executions from managed plugins which are part of the default lifecycle bindings get
      * executed after executions from plugins that are defined in the regular build section and bound to the
      * same phase.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 2cf8c5c..4bc675c 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -44,6 +43,8 @@ public class MavenITmng4345DefaultPluginExecutionOrderTest
      * Test that plugin executions contributed by default lifecycle mappings always execute first in the targetted
      * lifecycle phase regardless of other plugin executions bound to the same phase and regardless of the POM
      * order of plugin declarations.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 9411a31..a83593a 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4347ImportScopeWithSettingsProfilesTest
      * Test that profiles from settings.xml will be used to resolve import-scoped dependency POMs.
      * In this case, the settings profile enables snapshot resolution on the central repository, which
      * is required to resolve the import-scoped POM with a SNAPSHOT version.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 006949d..912cbea 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
@@ -52,6 +52,8 @@ public class MavenITmng4348NoUnnecessaryRepositoryAccessTest
     /**
      * Test that the (remote) repos are not accessed during execution of a mojo that does not require dependency
      * resolution. In detail, Maven should neither touch POMs, JARs nor metadata.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 e167c26..0b72b40 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng4349RelocatedArtifactWithInvalidPomTest
     /**
      * Test that relocation to an artifact with an invalid POM fails gracefully and still uses the relocated JAR
      * (instead of the JAR for the unrelocated artifact).
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 b3808b5..4a0fc3a 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -44,6 +43,8 @@ public class MavenITmng4350LifecycleMappingExecutionOrderTest
      * Test that multiple goals bound to the same phase by a lifecycle mapping execute in the order given by
      * the lifecycle mapping. In particular, the order of plugin declarations in the POM should have no influence
      * on the lifecycle mappings specified by the packaging.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 2a8bfa4..b7f48ae 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
@@ -40,6 +40,8 @@ public class MavenITmng4353PluginDependencyResolutionFromPomRepoTest
 
     /**
      * Verify that repos given in a plugin's POM are considered while resolving the plugin dependencies.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 65f758e..39688d9 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4355ExtensionAutomaticVersionResolutionTest
     /**
      * Test that extension declarations in the POM without an explicit version get resolved to the last release
      * version of the extension artifact.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 07ba15e..d5cb132 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest
     /**
      * Test that read operations on active collections of components do not cause a re-lookup of the components from
      * the container which would prevent usage of stateful components that are usually instantiated per lookup.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 958d777..46d0f8c 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4357LifecycleMappingDiscoveryInReactorTest
     /**
      * Test that different projects in a reactor build can use different versions of the same extension.
      * This should still hold true if the two versions of the extension provide the same set of components.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 39d017f..e12e3c9 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4359LocallyReachableParentOutsideOfReactorTest
     /**
      * Verify that locally reachable parent POMs of projects in the reactor can be resolved during dependency
      * resolution even if a parent itself is not part of the reactor.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 7a5238d..77fed1f 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
@@ -52,6 +52,8 @@ public class MavenITmng4360WebDavSupportTest
     /**
      * Verify that WebDAV works in principle. This test is not actually concerned about proper transfers but more
      * that the Jackrabbit based wagon can be properly loaded and doesn't die due to some class realm issue.
+     *
+     * @throws Exception in case of failure
      */
     public void testitJackrabbitBasedImpl()
         throws Exception
@@ -62,6 +64,8 @@ public class MavenITmng4360WebDavSupportTest
     /**
      * Verify that WebDAV works in principle. This test is not actually concerned about proper transfers but more
      * that the Slide based wagon can be properly loaded and doesn't die due to some class realm issue.
+     *
+     * @throws Exception in case of failure
      */
     public void testitSlideBasedImpl()
         throws Exception
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 09a82f6..0edc17c 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4361ForceDependencySnapshotUpdateTest
     /**
      * Verify that snapshot updates of dependencies can be forced from the command line via "-U". In more detail,
      * this means updating the JAR and its accompanying hierarchy of POMs.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 ce53e2f..1d1ae2b 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4363DynamicAdditionOfDependencyArtifactTest
     /**
      * Verify that plugins can dynamically add dependency artifacts to the project. Those added artifacts need to
      * be resolved and added to the affected class paths for later goal executions.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 e4bbbc5..c778969 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng4365XmlMarkupInAttributeValueTest
 
     /**
      * Test that the POM parser doesn't choke on attribute values that contain entities which resolve to markup.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 c58c70a..963ae6b 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,8 +39,10 @@ public class MavenITmng4367LayoutAwareMirrorSelectionTest
     }
 
     /**
-     * Test that mirror selection considers the repo layout if specified for the mirror. If <mirrorOfLayouts> is
+     * Test that mirror selection considers the repo layout if specified for the mirror. If {@code <mirrorOfLayouts>} is
      * unspecified, should match any layout.
+     *
+     * @throws Exception in case of failure
      */
     public void testitNoLayout()
         throws Exception
@@ -70,6 +71,8 @@ public class MavenITmng4367LayoutAwareMirrorSelectionTest
 
     /**
      * Test that mirror selection considers the repo layout if specified for the mirror.
+     *
+     * @throws Exception in case of failure
      */
     public void testitSpecificLayouts()
         throws Exception
@@ -98,6 +101,8 @@ public class MavenITmng4367LayoutAwareMirrorSelectionTest
 
     /**
      * Test that mirror selection considers the repo layout if specified for the mirror.
+     *
+     * @throws Exception in case of failure
      */
     public void testitNonMatchingLayout()
         throws Exception
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 6dcb5af..24d5625 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
@@ -41,6 +41,8 @@ public class MavenITmng4368TimestampAwareArtifactInstallerTest
     /**
      * Verify that the artifact installer copies POMs to the local repo even if they have an older timestamp as the
      * copy in the local repo.
+     *
+     * @throws Exception in case of failure
      */
     public void testitPomPackaging()
         throws Exception
@@ -89,6 +91,8 @@ public class MavenITmng4368TimestampAwareArtifactInstallerTest
     /**
      * Verify that the artifact installer copies files to the local repo only if their timestamp differs from the copy
      * already in the local repo.
+     *
+     * @throws Exception in case of failure
      */
     public void testitJarPackaging()
         throws Exception
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 77113f2..196ca39 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest
     /**
      * Test that the path of a system-scope dependency gets interpolated using environment variables during
      * transitive dependency resolution.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 51984cd..7d26702 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -42,6 +41,8 @@ public class MavenITmng4381ExtensionSingletonComponentTest
     /**
      * Test that extension plugins can contribute non-core components that can be accessed by other plugins in the same
      * project and in projects with the same extension.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 c6d85a3..02ffe73 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng4383ValidDependencyVersionTest
 
     /**
      * Test that non-interpolated dependency versions cause a validation error during building.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 ce21ba8..d989c1e 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng4385LifecycleMappingFromExtensionInReactorTest
     /**
      * Test that custom lifecycle mappings contributed by build extensions of one project do not leak into other
      * projects in the reactor.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 951ef3e..5eca943 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng4386DebugLoggingTest
 
     /**
      * Test that the CLI flag -X enables debug logging.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 39e6b72..300dcb6 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -43,6 +42,8 @@ public class MavenITmng4387QuietLoggingTest
 
     /**
      * Test that the CLI flag -q enables quiet logging, i.e. suppresses log levels below ERROR.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 16b3d15..4b9fc4b 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng4393ParseExternalParenPomLenientTest
 
     /**
      * Verify that parent POMs get parsed in lenient mode when resolved from the repository.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 28c3012..56f9793 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng4396AntBased20xMojoSupportTest
     /**
      * Verify that plugins whose mojos are implemented as Ant scripts and use the Maven 2.0.x Ant support can be
      * invoked.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 8efc239..99f283d 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng4400RepositoryOrderTest
 
     /**
      * Verify that repositories declared in the settings.xml are accessed in their declaration order.
+     *
+     * @throws Exception in case of failure
      */
     public void testitSettingsRepos()
         throws Exception
@@ -63,6 +64,8 @@ public class MavenITmng4400RepositoryOrderTest
 
     /**
      * Verify that repositories declared in the POM are accessed in their declaration order.
+     *
+     * @throws Exception in case of failure
      */
     public void testitPomRepos()
         throws Exception
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 b250a7e..6eea928 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng4401RepositoryOrderForParentPomTest
     /**
      * Verify that the implicit default repo (central) is tried after explicitly declared repos during parent POM
      * resolution.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 24fb3a4..9c3bb15 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng4402DuplicateChildModuleTest
 
     /**
      * Verify that duplicate declarations of child modules cause a model validation error during project building.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 b085a5b..f7a20f1 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
@@ -44,6 +44,8 @@ public class MavenITmng4403LenientDependencyPomParsingTest
      * Test that dependency POMs are only subject to minimal validation during metadata retrieval, i.e. Maven should
      * ignore most kinds of badness and make a best effort at getting the metadata. Of particular interest is also,
      * how Maven deals with duplicate dependency declarations.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 d73026b..e079c31 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng4404UniqueProfileIdTest
 
     /**
      * Verify that non-unique profile ids cause a model validation error during project building.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 8192bad..d71fa66 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng4405ValidPluginVersionTest
 
     /**
      * Test that non-interpolated plugin versions cause a validation error during building.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 508501e..e5edbbd 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng4408NonExistentSettingsFileTest
 
     /**
      * Verify that the build fails when the user specifies a non-existing user settings file on the CLI.
+     *
+     * @throws Exception in case of failure
      */
     public void testitUserSettings()
         throws Exception
@@ -69,6 +70,8 @@ public class MavenITmng4408NonExistentSettingsFileTest
 
     /**
      * Verify that the build fails when the user specifies a non-existing global settings file on the CLI.
+     *
+     * @throws Exception in case of failure
      */
     public void testitGlobalSettings()
         throws Exception
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 cca2cd7..1966384 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng4410UsageHelpTest
 
     /**
      * Verify that "mvn --help" outputs the usage help and stops the execution after that.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 22346e3..1dfca32 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
@@ -39,6 +39,8 @@ public class MavenITmng4411VersionInfoTest
 
     /**
      * Verify that "mvn --version" outputs the Maven version and stops the execution after that.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 c1c5c86..9845257 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng4412OfflineModeInPluginTest
     /**
      * Verify that plugins using the 2.x style artifact resolver directly are subject to the offline mode of the
      * current Maven session.
+     *
+     * @throws Exception in case of failure
      */
     public void testitResolver()
         throws Exception
@@ -76,6 +77,8 @@ public class MavenITmng4412OfflineModeInPluginTest
     /**
      * Verify that plugins using the 2.x style artifact collector directly are subject to the offline mode of the
      * current Maven session.
+     *
+     * @throws Exception in case of failure
      */
     public void testitCollector()
         throws Exception
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 a6cc2b7..d1f9204 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
@@ -56,6 +56,8 @@ public class MavenITmng4413MirroringOfDependencyRepoTest
     /**
      * Test that repositories contributed by dependency POMs during transitive dependency resolution are subject to
      * mirror and authentication configuration.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 42738e4..16411f8 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
@@ -42,9 +42,11 @@ public class MavenITmng4415InheritedPluginOrderTest
 
     /**
      * Test that merging of plugins during inheritance follows these rules regarding ordering:
-     * parent: X ->      A -> B ->      D -> E
+     * {@code parent: X ->      A -> B ->      D -> E
      * child:       Y -> A ->      C -> D ->      F
-     * result: X -> Y -> A -> B -> C -> D -> E -> F
+     * result: X -> Y -> A -> B -> C -> D -> E -> F}
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 b514205..169c0ec 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
@@ -42,9 +42,11 @@ public class MavenITmng4416PluginOrderAfterProfileInjectionTest
 
     /**
      * Test that merging of plugins during profile injection follows these rules regarding ordering:
-     * model:   X ->      A -> B ->      D -> E
+     * {@code model:   X ->      A -> B ->      D -> E
      * profile:      Y -> A ->      C -> D ->      F
-     * result:  X -> Y -> A -> B -> C -> D -> E -> F
+     * result:  X -> Y -> A -> B -> C -> D -> E -> F}
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 2a8ffbf..394a978 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
@@ -41,6 +41,8 @@ public class MavenITmng4421DeprecatedPomInterpolationExpressionsTest
 
     /**
      * Test that expressions of the form ${pom.*} and {*} referring to the model cause build warnings.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 704880b..036c788 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -40,6 +39,8 @@ public class MavenITmng4422PluginExecutionPhaseInterpolationTest
 
     /**
      * Test that the phase of plugin executions can be interpolated.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 c0fd0ef..bf92d35 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng4423SessionDataFromPluginParameterExpressionTest
 
     /**
      * Test that plugin parameter expressions like ${session.*} work and not only ${session}.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 8400570..d6f708e 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
@@ -59,6 +59,8 @@ public class MavenITmng4428FollowHttpRedirectTest
 
     /**
      * Verify that redirects from HTTP to HTTP are getting followed.
+     *
+     * @throws Exception in case of failure
      */
     public void testitHttpToHttp()
         throws Exception
@@ -68,6 +70,8 @@ public class MavenITmng4428FollowHttpRedirectTest
 
     /**
      * Verify that redirects from HTTPS to HTTPS are getting followed.
+     *
+     * @throws Exception in case of failure
      */
     public void testitHttpsToHttps()
         throws Exception
@@ -77,6 +81,8 @@ public class MavenITmng4428FollowHttpRedirectTest
 
     /**
      * Verify that redirects from HTTP to HTTPS are getting followed.
+     *
+     * @throws Exception in case of failure
      */
     public void testitHttpToHttps()
         throws Exception
@@ -88,6 +94,8 @@ public class MavenITmng4428FollowHttpRedirectTest
 
     /**
      * Verify that redirects from HTTPS to HTTP are getting followed.
+     *
+     * @throws Exception in case of failure
      */
     public void testitHttpsToHttp()
         throws Exception
@@ -100,6 +108,8 @@ public class MavenITmng4428FollowHttpRedirectTest
     /**
      * Verify that redirects using a relative location URL are getting followed. While a relative URL violates the
      * HTTP spec, popular HTTP clients do support them so we better do, too.
+     *
+     * @throws Exception in case of failure
      */
     public void testitRelativeLocation()
         throws Exception
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 5db7b70..9b75a06 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng4429CompRequirementOnNonDefaultImplTest
 
     /**
      * Test that a component requirement can be satisfied from an implementation that does not have the "default" hint.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 bc2ea1a..65c6a28 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng4430DistributionManagementStatusTest
     /**
      * Test that presence of status field in distribution management of a local project POM causes a validation error,
      * this field is only allowed for POMs from the repo.
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
         throws Exception
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 17eb6df..c574cbf 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -41,6 +40,8 @@ public class MavenITmng4433ForceParentSnapshotUpdateTest
 
     /**
      * Verify that snapshot updates of parent POMs can be forced from the command line via "-U".
+     *
+     * @throws Exception in case of failure
      */
     public void testit()
... 3293 lines suppressed ...