You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2026/09/21 10:46:11 UTC
(maven-integration-testing) 01/03: Migrate core ITs from maven-verifier to maven-executor
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch agent/maven-executor-migration-310
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit db044bdf139dfc4760fe0b31dcd726e9d681d22d
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Sep 21 12:40:13 2026 +0200
Migrate core ITs from maven-verifier to maven-executor
maven-verifier is deprecated (apache/maven-verifier#186); the Verifier is now the in-repo org.apache.maven.it.Verifier on maven-executor, as on master.
Artifact paths are computed locally, without the toolbox plugin (apache/maven-executor#44).
(cherry picked from commit 8b1c9b04a877b3447b3b8cf79525899309b20540)
---
core-it-suite/pom.xml | 4 +-
.../maven/it/MavenIT0008SimplePluginTest.java | 4 +-
.../maven/it/MavenIT0009GoalConfigurationTest.java | 4 +-
...MavenIT0010DependencyClosureResolutionTest.java | 4 +-
...11DefaultVersionByDependencyManagementTest.java | 4 +-
.../maven/it/MavenIT0012PomInterpolationTest.java | 4 +-
.../it/MavenIT0018DependencyManagementTest.java | 4 +-
...MavenIT0019PluginVersionMgmtBySuperPomTest.java | 4 +-
.../apache/maven/it/MavenIT0021PomProfileTest.java | 4 +-
.../maven/it/MavenIT0023SettingsProfileTest.java | 4 +-
.../it/MavenIT0024MultipleGoalExecutionsTest.java | 4 +-
...venIT0025MultipleExecutionLevelConfigsTest.java | 4 +-
.../MavenIT0030DepPomDepMgmtInheritanceTest.java | 4 +-
.../maven/it/MavenIT0032MavenPrerequisiteTest.java | 4 +-
.../it/MavenIT0037AlternatePomFileSameDirTest.java | 4 +-
...avenIT0038AlternatePomFileDifferentDirTest.java | 4 +-
...avenIT0040PackagingFromPluginExtensionTest.java | 4 +-
...nIT0041ArtifactTypeFromPluginExtensionTest.java | 4 +-
.../it/MavenIT0056MultipleGoalExecutionsTest.java | 4 +-
.../it/MavenIT0063SystemScopeDependencyTest.java | 4 +-
.../it/MavenIT0064MojoConfigViaSettersTest.java | 4 +-
...enIT0071PluginConfigWithDottedPropertyTest.java | 4 +-
...nIT0072InterpolationWithDottedPropertyTest.java | 4 +-
.../it/MavenIT0085TransitiveSystemScopeTest.java | 6 +-
.../maven/it/MavenIT0086PluginRealmTest.java | 4 +-
...nIT0087PluginRealmWithProjectLevelDepsTest.java | 4 +-
.../it/MavenIT0090EnvVarInterpolationTest.java | 4 +-
.../maven/it/MavenIT0108SnapshotUpdateTest.java | 6 +-
...ServerAuthzAvailableToWagonMgrInPluginTest.java | 4 +-
.../maven/it/MavenIT0130CleanLifecycleTest.java | 4 +-
.../maven/it/MavenIT0131SiteLifecycleTest.java | 4 +-
.../maven/it/MavenIT0132PomLifecycleTest.java | 4 +-
.../maven/it/MavenIT0133JarLifecycleTest.java | 4 +-
.../maven/it/MavenIT0134WarLifecycleTest.java | 4 +-
.../maven/it/MavenIT0135EjbLifecycleTest.java | 4 +-
.../maven/it/MavenIT0136RarLifecycleTest.java | 4 +-
.../maven/it/MavenIT0137EarLifecycleTest.java | 4 +-
.../maven/it/MavenIT0138PluginLifecycleTest.java | 4 +-
...enIT0139InterpolationWithProjectPrefixTest.java | 4 +-
.../MavenIT0140InterpolationWithPomPrefixTest.java | 4 +-
.../it/MavenIT0142DirectDependencyScopesTest.java | 4 +-
.../MavenIT0143TransitiveDependencyScopesTest.java | 4 +-
.../it/MavenIT0144LifecycleExecutionOrderTest.java | 4 +-
.../it/MavenIT0146InstallerSnapshotNaming.java | 4 +-
.../maven/it/MavenIT0199CyclicImportScopeTest.java | 4 +-
.../org/apache/maven/it/MavenITBootstrapTest.java | 4 +-
...10312TerminallyDeprecatedMethodInGuiceTest.java | 4 +-
.../MavenITgh10937QuotedPipesInMavenOptsTest.java | 4 +-
.../MavenITmng0095ReactorFailureBehaviorTest.java | 6 +-
.../it/MavenITmng0187CollectedProjectsTest.java | 4 +-
.../MavenITmng0249ResolveDepsFromReactorTest.java | 4 +-
...82NonReactorExecWhenProjectIndependentTest.java | 4 +-
...venITmng0294MergeGlobalAndUserSettingsTest.java | 4 +-
.../MavenITmng0377PluginLookupFromPrefixTest.java | 4 +-
.../MavenITmng0449PluginVersionResolutionTest.java | 4 +-
...nITmng0461TolerateMissingDependencyPomTest.java | 4 +-
.../maven/it/MavenITmng0469ReportConfigTest.java | 4 +-
.../it/MavenITmng0471CustomLifecycleTest.java | 4 +-
.../it/MavenITmng0479OverrideCentralRepoTest.java | 6 +-
...ITmng0496IgnoreUnknownPluginParametersTest.java | 4 +-
.../maven/it/MavenITmng0505VersionRangeTest.java | 4 +-
.../it/MavenITmng0507ArtifactRelocationTest.java | 4 +-
...avenITmng0522InheritedPluginMgmtConfigTest.java | 4 +-
.../MavenITmng0553SettingsAuthzEncryptionTest.java | 4 +-
.../MavenITmng0557UserSettingsCliOptionTest.java | 4 +-
.../MavenITmng0612NewestConflictResolverTest.java | 4 +-
.../it/MavenITmng0666IgnoreLegacyPomTest.java | 4 +-
.../it/MavenITmng0674PluginParameterAliasTest.java | 4 +-
.../maven/it/MavenITmng0680ParentBasedirTest.java | 4 +-
.../MavenITmng0761MissingSnapshotDistRepoTest.java | 4 +-
.../maven/it/MavenITmng0768OfflineModeTest.java | 6 +-
...mng0773SettingsProfileReactorPollutionTest.java | 4 +-
...MavenITmng0781PluginConfigVsExecConfigTest.java | 4 +-
.../it/MavenITmng0786ProfileAwareReactorTest.java | 4 +-
...avenITmng0814ExplicitProfileActivationTest.java | 4 +-
.../it/MavenITmng0818WarDepsNotTransitiveTest.java | 4 +-
.../it/MavenITmng0820ConflictResolutionTest.java | 4 +-
.../it/MavenITmng0823MojoContextPassingTest.java | 4 +-
...avenITmng0828PluginConfigValuesInDebugTest.java | 4 +-
.../MavenITmng0836PluginParentResolutionTest.java | 6 +-
...g0848UserPropertyOverridesDefaultValueTest.java | 4 +-
.../it/MavenITmng0866EvaluateDefaultValueTest.java | 4 +-
...enITmng0870ReactorAwarePluginDiscoveryTest.java | 4 +-
.../it/MavenITmng0947OptionalDependencyTest.java | 4 +-
...onentInjectionViaProjectLevelPluginDepTest.java | 4 +-
...venITmng0985NonExecutedPluginMgmtGoalsTest.java | 4 +-
...venITmng1021EqualAttachmentBuildNumberTest.java | 4 +-
.../it/MavenITmng1052PluginMgmtConfigTest.java | 4 +-
.../MavenITmng1073AggregatorForksReactorTest.java | 4 +-
.../MavenITmng1088ReactorPluginResolutionTest.java | 4 +-
...MavenITmng1142VersionRangeIntersectionTest.java | 4 +-
.../it/MavenITmng1144MultipleDefaultGoalsTest.java | 4 +-
.../MavenITmng1233WarDepWithProvidedScopeTest.java | 4 +-
.../it/MavenITmng1323AntrunDependenciesTest.java | 4 +-
.../it/MavenITmng1349ChecksumFormatsTest.java | 4 +-
.../it/MavenITmng1412DependenciesOrderTest.java | 4 +-
.../MavenITmng1415QuotedSystemPropertiesTest.java | 4 +-
...venITmng1491ReactorArtifactIdCollisionTest.java | 6 +-
...avenITmng1493NonStandardModulePomNamesTest.java | 4 +-
.../it/MavenITmng1701DuplicatePluginTest.java | 6 +-
...MavenITmng1703PluginMgmtDepInheritanceTest.java | 4 +-
...51ForcedMetadataUpdateDuringDeploymentTest.java | 4 +-
...03PomValidationErrorIncludesLineNumberTest.java | 4 +-
.../MavenITmng1895ScopeConflictResolutionTest.java | 4 +-
...ITmng1957JdkActivationWithVersionRangeTest.java | 4 +-
...venITmng1992SystemPropOverridesPomPropTest.java | 4 +-
...mng1995InterpolateBooleanModelElementsTest.java | 4 +-
...nITmng2006ChildPathAwareUrlInheritanceTest.java | 4 +-
...2045testJarDependenciesBrokenInReactorTest.java | 4 +-
...terpolateWithSettingsProfilePropertiesTest.java | 4 +-
...venITmng2054PluginExecutionInheritanceTest.java | 4 +-
.../MavenITmng2068ReactorRelativeParentsTest.java | 4 +-
...2098VersionRangeSatisfiedFromWrongRepoTest.java | 4 +-
...venITmng2103PluginExecutionInheritanceTest.java | 4 +-
.../MavenITmng2123VersionRangeDependencyTest.java | 4 +-
...ng2124PomInterpolationWithParentValuesTest.java | 4 +-
...nITmng2130ParentLookupFromReactorCacheTest.java | 4 +-
.../it/MavenITmng2135PluginBuildInReactorTest.java | 4 +-
.../MavenITmng2136ActiveByDefaultProfileTest.java | 4 +-
...g2140ReactorAwareDepResolutionWhenForkTest.java | 4 +-
...ng2174PluginDepsManagedByParentProfileTest.java | 4 +-
.../it/MavenITmng2196ParentResolutionTest.java | 6 +-
.../it/MavenITmng2199ParentVersionRangeTest.java | 6 +-
...avenITmng2201PluginConfigInterpolationTest.java | 4 +-
...ng2222OutputDirectoryReactorResolutionTest.java | 4 +-
.../it/MavenITmng2228ComponentInjectionTest.java | 4 +-
...venITmng2234ActiveProfilesFromSettingsTest.java | 4 +-
.../maven/it/MavenITmng2254PomEncodingTest.java | 4 +-
...276ProfileActivationBySettingsPropertyTest.java | 4 +-
...Tmng2277AggregatorAndResolutionPluginsTest.java | 4 +-
.../it/MavenITmng2305MultipleProxiesTest.java | 4 +-
.../MavenITmng2309ProfileInjectionOrderTest.java | 4 +-
.../MavenITmng2318LocalParentResolutionTest.java | 4 +-
.../MavenITmng2339BadProjectInterpolationTest.java | 4 +-
.../it/MavenITmng2362DeployedPomEncodingTest.java | 4 +-
...avenITmng2363BasedirAwareFileActivatorTest.java | 4 +-
.../maven/it/MavenITmng2387InactiveProxyTest.java | 4 +-
.../it/MavenITmng2432PluginPrefixOrderTest.java | 4 +-
...estampedDependencyVersionInterpolationTest.java | 4 +-
.../maven/it/MavenITmng2562Timestamp322Test.java | 4 +-
.../it/MavenITmng2576MakeLikeReactorTest.java | 4 +-
...MavenITmng2577SettingsXmlInterpolationTest.java | 4 +-
...venITmng2591MergeInheritedPluginConfigTest.java | 4 +-
.../MavenITmng2605BogusProfileActivationTest.java | 4 +-
...mng2668UsePluginDependenciesForSortingTest.java | 4 +-
.../it/MavenITmng2690MojoLoadingErrorsTest.java | 6 +-
.../it/MavenITmng2693SitePluginRealmTest.java | 4 +-
.../MavenITmng2695OfflinePluginSnapshotsTest.java | 4 +-
...avenITmng2720SiblingClasspathArtifactsTest.java | 4 +-
...Tmng2738ProfileIdCollidesWithCliOptionTest.java | 4 +-
...venITmng2739RequiredRepositoryElementsTest.java | 6 +-
...41PluginMetadataResolutionErrorMessageTest.java | 6 +-
.../it/MavenITmng2744checksumVerificationTest.java | 4 +-
...venITmng2749ExtensionAvailableToPluginTest.java | 4 +-
...ITmng2771PomExtensionComponentOverrideTest.java | 4 +-
.../it/MavenITmng2790LastUpdatedMetadataTest.java | 4 +-
.../maven/it/MavenITmng2820PomCommentsTest.java | 4 +-
...ustomArtifactHandlerAndCustomLifecycleTest.java | 4 +-
...mng2843PluginConfigPropertiesInjectionTest.java | 4 +-
...ProfileActivationByEnvironmentVariableTest.java | 4 +-
.../it/MavenITmng2861RelocationsAndRangesTest.java | 4 +-
.../maven/it/MavenITmng2865MirrorWildcardTest.java | 4 +-
...mng2871PrePackageSubartifactResolutionTest.java | 4 +-
.../it/MavenITmng2892HideCorePlexusUtilsTest.java | 4 +-
.../MavenITmng2921ActiveAttachedArtifactsTest.java | 4 +-
.../it/MavenITmng2926PluginPrefixOrderTest.java | 4 +-
...MavenITmng2972OverridePluginDependencyTest.java | 4 +-
.../MavenITmng2994SnapshotRangeRepositoryTest.java | 4 +-
...004ReactorFailureBehaviorMultithreadedTest.java | 6 +-
.../it/MavenITmng3012CoreClassImportTest.java | 4 +-
...enITmng3023ReactorDependencyResolutionTest.java | 6 +-
.../MavenITmng3038TransitiveDepManVersionTest.java | 6 +-
...enITmng3043BestEffortReactorResolutionTest.java | 4 +-
.../it/MavenITmng3052DepRepoAggregationTest.java | 4 +-
...g3092SnapshotsExcludedFromVersionRangeTest.java | 4 +-
...avenITmng3099SettingsProfilesWithNoPomTest.java | 4 +-
.../it/MavenITmng3118TestClassPathOrderTest.java | 4 +-
...venITmng3122ActiveProfilesNoDuplicatesTest.java | 4 +-
...UrlNormalizationNotBeforeInterpolationTest.java | 4 +-
...3139UseCachedMetadataOfBlacklistedRepoTest.java | 4 +-
.../maven/it/MavenITmng3183LoggingToFileTest.java | 4 +-
.../MavenITmng3203DefaultLifecycleExecIdTest.java | 4 +-
...venITmng3208ProfileAwareReactorSortingTest.java | 4 +-
.../MavenITmng3217InterPluginDependencyTest.java | 4 +-
.../maven/it/MavenITmng3220ImportScopeTest.java | 6 +-
...ITmng3259DepsDroppedInMultiModuleBuildTest.java | 4 +-
...venITmng3268MultipleHyphenPCommandLineTest.java | 4 +-
.../it/MavenITmng3284UsingCachedPluginsTest.java | 4 +-
.../maven/it/MavenITmng3288SystemScopeDirTest.java | 6 +-
...enITmng3297DependenciesNotLeakedToMojoTest.java | 4 +-
.../it/MavenITmng3314OfflineSnapshotsTest.java | 4 +-
.../MavenITmng3331ModulePathNormalizationTest.java | 4 +-
...enITmng3355TranslatedPathInterpolationTest.java | 4 +-
...avenITmng3372DirectInvocationOfPluginsTest.java | 4 +-
...avenITmng3379ParallelArtifactDownloadsTest.java | 4 +-
...avenITmng3380ManagedRelocatedTransdepsTest.java | 4 +-
...avenITmng3394POMPluginVersionDominanceTest.java | 4 +-
...encyManagementForOverConstrainedRangesTest.java | 4 +-
.../it/MavenITmng3401CLIDefaultExecIdTest.java | 4 +-
.../MavenITmng3415JunkRepositoryMetadataTest.java | 4 +-
...avenITmng3422ActiveComponentCollectionTest.java | 4 +-
...etadataUpdatedFromDeploymentRepositoryTest.java | 4 +-
.../maven/it/MavenITmng3461MirrorMatchingTest.java | 4 +-
...ictChecksumVerificationOfDependencyPomTest.java | 6 +-
.../maven/it/MavenITmng3475BaseAlignedDirTest.java | 4 +-
...ng3477DependencyResolutionErrorMessageTest.java | 6 +-
...venITmng3482DependencyPomInterpolationTest.java | 4 +-
.../MavenITmng3485OverrideWagonExtensionTest.java | 4 +-
.../it/MavenITmng3498ForkToOtherMojoTest.java | 4 +-
.../maven/it/MavenITmng3503Xpp3ShadingTest.java | 4 +-
...enITmng3506ArtifactHandlersFromPluginsTest.java | 6 +-
.../maven/it/MavenITmng3529QuotedCliArgTest.java | 4 +-
...avenITmng3535SelfReferentialPropertiesTest.java | 4 +-
.../MavenITmng3536AppendedAbsolutePathsTest.java | 4 +-
.../it/MavenITmng3545ProfileDeactivationTest.java | 4 +-
...5HexadecimalOctalPluginParameterConfigTest.java | 4 +-
...avenITmng3581PluginUsesWagonDependencyTest.java | 4 +-
...enITmng3586SystemScopePluginDependencyTest.java | 6 +-
...MavenITmng3599useHttpProxyForWebDAVMk2Test.java | 4 +-
.../MavenITmng3600DeploymentModeDefaultsTest.java | 4 +-
...MavenITmng3607ClassLoadersUseValidUrlsTest.java | 4 +-
.../it/MavenITmng3621UNCInheritedPathsTest.java | 4 +-
...MavenITmng3641ProfileActivationWarningTest.java | 4 +-
.../it/MavenITmng3642DynamicResourcesTest.java | 4 +-
.../maven/it/MavenITmng3645POMSyntaxErrorTest.java | 6 +-
.../it/MavenITmng3652UserAgentHeaderTest.java | 4 +-
...nITmng3667ResolveDepsWithBadPomVersionTest.java | 4 +-
...enITmng3671PluginLevelDepInterpolationTest.java | 4 +-
...avenITmng3679PluginExecIdInterpolationTest.java | 4 +-
.../it/MavenITmng3680InvalidDependencyPOMTest.java | 4 +-
.../it/MavenITmng3684BuildPluginParameterTest.java | 4 +-
.../it/MavenITmng3693PomFileBasedirChangeTest.java | 4 +-
.../MavenITmng3694ReactorProjectsDynamismTest.java | 4 +-
.../it/MavenITmng3701ImplicitProfileIdTest.java | 4 +-
...g3703ExecutionProjectWithRelativePathsTest.java | 4 +-
.../MavenITmng3710PollutedClonedPluginsTest.java | 4 +-
.../it/MavenITmng3714ToolchainsCliOptionTest.java | 4 +-
.../it/MavenITmng3716AggregatorForkingTest.java | 4 +-
.../it/MavenITmng3719PomExecutionOrderingTest.java | 4 +-
.../MavenITmng3723ConcreteParentProjectTest.java | 4 +-
.../it/MavenITmng3724ExecutionProjectSyncTest.java | 4 +-
.../it/MavenITmng3729MultiForkAggregatorsTest.java | 4 +-
.../maven/it/MavenITmng3732ActiveProfilesTest.java | 4 +-
...Tmng3740SelfReferentialReactorProjectsTest.java | 4 +-
.../it/MavenITmng3746POMPropertyOverrideTest.java | 4 +-
.../MavenITmng3747PrefixedPathExpressionTest.java | 4 +-
.../maven/it/MavenITmng3748BadSettingsXmlTest.java | 6 +-
.../MavenITmng3766ToolchainsFromExtensionTest.java | 4 +-
...enITmng3769ExclusionRelocatedTransdepsTest.java | 4 +-
...Tmng3775ConflictResolutionBacktrackingTest.java | 4 +-
...MavenITmng3796ClassImportInconsistencyTest.java | 4 +-
...venITmng3805ExtensionClassPathOrderingTest.java | 4 +-
...ng3807PluginConfigExpressionEvaluationTest.java | 4 +-
...avenITmng3808ReportInheritanceOrderingTest.java | 4 +-
.../it/MavenITmng3810BadProfileActivationTest.java | 4 +-
...eportingPluginConfigurationInheritanceTest.java | 4 +-
.../MavenITmng3813PluginClassPathOrderingTest.java | 4 +-
.../it/MavenITmng3814BogusProjectCycleTest.java | 4 +-
.../it/MavenITmng3821EqualPluginExecIdsTest.java | 4 +-
...enITmng3822BasedirAlignedInterpolationTest.java | 4 +-
.../maven/it/MavenITmng3827PluginConfigTest.java | 4 +-
.../it/MavenITmng3831PomInterpolationTest.java | 4 +-
...ITmng3833PomInterpolationDataFlowChainTest.java | 4 +-
.../MavenITmng3836PluginConfigInheritanceTest.java | 4 +-
.../it/MavenITmng3838EqualPluginDepsTest.java | 4 +-
.../MavenITmng3839PomParsingCoalesceTextTest.java | 4 +-
.../maven/it/MavenITmng3843PomInheritanceTest.java | 4 +-
.../MavenITmng3845LimitedPomInheritanceTest.java | 4 +-
...enITmng3846PomInheritanceUrlAdjustmentTest.java | 4 +-
...g3852PluginConfigWithHeterogeneousListTest.java | 4 +-
...MavenITmng3853ProfileInjectedDistReposTest.java | 4 +-
.../it/MavenITmng3863AutoPluginGroupIdTest.java | 6 +-
.../it/MavenITmng3864PerExecPluginConfigTest.java | 4 +-
.../MavenITmng3866PluginConfigInheritanceTest.java | 4 +-
...mng3872ProfileActivationInRelocatedPomTest.java | 4 +-
.../MavenITmng3873MultipleExecutionGoalsTest.java | 4 +-
.../it/MavenITmng3877BasedirAlignedModelTest.java | 4 +-
.../it/MavenITmng3886ExecutionGoalsOrderTest.java | 4 +-
.../it/MavenITmng3887PluginExecutionOrderTest.java | 4 +-
...mng3890TransitiveDependencyScopeUpdateTest.java | 4 +-
.../it/MavenITmng3892ReleaseDeploymentTest.java | 4 +-
.../it/MavenITmng3899ExtensionInheritanceTest.java | 4 +-
...Tmng3900ProfilePropertiesInterpolationTest.java | 4 +-
...enITmng3904NestedBuildDirInterpolationTest.java | 4 +-
...ITmng3906MergedPluginClassPathOrderingTest.java | 4 +-
...venITmng3916PluginExecutionInheritanceTest.java | 4 +-
.../MavenITmng3924XmlMarkupInterpolationTest.java | 4 +-
...venITmng3925MergedPluginExecutionOrderTest.java | 4 +-
...nITmng3927PluginDefaultExecutionConfigTest.java | 4 +-
...venITmng3937MergedPluginExecutionGoalsTest.java | 4 +-
.../MavenITmng3938MergePluginExecutionsTest.java | 4 +-
.../it/MavenITmng3940EnvVarInterpolationTest.java | 4 +-
...xecutionProjectRestrictedToForkingMojoTest.java | 4 +-
...venITmng3943PluginExecutionInheritanceTest.java | 4 +-
.../it/MavenITmng3944BasedirInterpolationTest.java | 4 +-
...nITmng3947PluginDefaultExecutionConfigTest.java | 4 +-
...ng3948ParentResolutionFromProfileReposTest.java | 4 +-
.../maven/it/MavenITmng3951AbsolutePathsTest.java | 4 +-
.../MavenITmng3953AuthenticatedDeploymentTest.java | 4 +-
.../it/MavenITmng3955EffectiveSettingsTest.java | 4 +-
...ITmng3970DepResolutionFromProfileReposTest.java | 4 +-
.../maven/it/MavenITmng3974MirrorOrderingTest.java | 4 +-
.../maven/it/MavenITmng3979ElementJoinTest.java | 4 +-
...ng3983PluginResolutionFromProfileReposTest.java | 4 +-
.../it/MavenITmng3991ValidDependencyScopeTest.java | 4 +-
.../MavenITmng3998PluginExecutionConfigTest.java | 4 +-
.../MavenITmng4000MultiPluginExecutionsTest.java | 4 +-
.../it/MavenITmng4005UniqueDependencyKeyTest.java | 6 +-
.../MavenITmng4007PlatformFileSeparatorTest.java | 4 +-
.../it/MavenITmng4008MergedFilterOrderTest.java | 4 +-
.../MavenITmng4009InheritProfileEffectsTest.java | 4 +-
...ITmng4016PrefixedPropertyInterpolationTest.java | 4 +-
...ITmng4022IdempotentPluginConfigMergingTest.java | 4 +-
...ITmng4023ParentProfileOneTimeInjectionTest.java | 4 +-
...MavenITmng4026ReactorDependenciesOrderTest.java | 4 +-
...MavenITmng4034ManagedProfileDependencyTest.java | 4 +-
...ng4036ParentResolutionFromSettingsRepoTest.java | 4 +-
.../MavenITmng4040ProfileInjectedModulesTest.java | 4 +-
...ITmng4048VersionRangeReactorResolutionTest.java | 4 +-
.../MavenITmng4052ReactorAwareImportScopeTest.java | 4 +-
.../MavenITmng4053PluginConfigAttributesTest.java | 4 +-
...lassifierBasedDepResolutionFromReactorTest.java | 4 +-
.../it/MavenITmng4068AuthenticatedMirrorTest.java | 4 +-
.../it/MavenITmng4070WhitespaceTrimmingTest.java | 4 +-
.../it/MavenITmng4072InactiveProfileReposTest.java | 4 +-
.../MavenITmng4087PercentEncodedFileUrlTest.java | 4 +-
.../it/MavenITmng4091BadPluginDescriptorTest.java | 6 +-
...Tmng4102InheritedPropertyInterpolationTest.java | 4 +-
...ng4106InterpolationUsesDominantProfileTest.java | 4 +-
...InterpolationUsesDominantProfileSourceTest.java | 4 +-
.../it/MavenITmng4112MavenVersionPropertyTest.java | 4 +-
.../maven/it/MavenITmng4116UndecodedUrlsTest.java | 4 +-
...venITmng4129PluginExecutionInheritanceTest.java | 4 +-
.../maven/it/MavenITmng4150VersionRangeTest.java | 4 +-
.../it/MavenITmng4162ReportingMigrationTest.java | 4 +-
.../it/MavenITmng4166HideCoreCommonsCliTest.java | 4 +-
.../it/MavenITmng4172EmptyDependencySetTest.java | 4 +-
.../MavenITmng4180PerDependencyExclusionsTest.java | 4 +-
.../MavenITmng4189UniqueVersionSnapshotTest.java | 4 +-
.../it/MavenITmng4190MirrorRepoMergingTest.java | 4 +-
.../maven/it/MavenITmng4193UniqueRepoIdTest.java | 6 +-
.../it/MavenITmng4196ExclusionOnPluginDepTest.java | 4 +-
...MavenITmng4199CompileMeetsRuntimeScopeTest.java | 4 +-
...ITmng4203TransitiveDependencyExclusionTest.java | 4 +-
.../it/MavenITmng4207PluginWithLog4JTest.java | 4 +-
...nterpolationPrefersCliOverProjectPropsTest.java | 4 +-
...avenITmng4214MirroredParentSearchReposTest.java | 4 +-
.../it/MavenITmng4231SnapshotUpdatePolicyTest.java | 4 +-
...orResolutionForManuallyCreatedArtifactTest.java | 4 +-
...enITmng4235HttpAuthDeploymentChecksumsTest.java | 4 +-
...ITmng4238ArtifactHandlerExtensionUsageTest.java | 6 +-
...nITmng4262MakeLikeReactorDottedPath370Test.java | 4 +-
...avenITmng4262MakeLikeReactorDottedPathTest.java | 4 +-
...Tmng4269BadReactorResolutionFromOutDirTest.java | 4 +-
...Tmng4270ArtifactHandlersFromPluginDepsTest.java | 6 +-
...4273RestrictedCoreRealmAccessForPluginTest.java | 4 +-
.../it/MavenITmng4274PluginRealmArtifactsTest.java | 4 +-
.../it/MavenITmng4275RelocationWarningTest.java | 4 +-
...venITmng4276WrongTransitivePlexusUtilsTest.java | 4 +-
.../it/MavenITmng4281PreferLocalSnapshotTest.java | 4 +-
.../it/MavenITmng4283ParentPomPackagingTest.java | 6 +-
.../MavenITmng4291MojoRequiresOnlineModeTest.java | 6 +-
.../MavenITmng4292EnumTypeMojoParametersTest.java | 4 +-
...mng4293RequiresCompilePlusRuntimeScopeTest.java | 4 +-
...venITmng4304ProjectDependencyArtifactsTest.java | 4 +-
.../it/MavenITmng4305LocalRepoBasedirTest.java | 4 +-
...309StrictChecksumValidationForMetadataTest.java | 6 +-
...warePluginParameterExpressionInjectionTest.java | 4 +-
...nITmng4314DirectInvocationOfAggregatorTest.java | 4 +-
...7PluginVersionResolutionFromMultiReposTest.java | 4 +-
.../it/MavenITmng4318ProjectExecutionRootTest.java | 4 +-
...ng4319PluginExecutionGoalInterpolationTest.java | 4 +-
...avenITmng4320AggregatorAndDependenciesTest.java | 4 +-
.../MavenITmng4321CliUsesPluginMgmtConfigTest.java | 4 +-
...4326LocalSnapshotSuppressesRemoteCheckTest.java | 4 +-
...7ExcludeForkingMojoFromForkedLifecycleTest.java | 4 +-
...328PrimitiveMojoParameterConfigurationTest.java | 4 +-
.../it/MavenITmng4331DependencyCollectionTest.java | 4 +-
...enITmng4332DefaultPluginExecutionOrderTest.java | 4 +-
.../it/MavenITmng4335SettingsOfflineModeTest.java | 6 +-
.../maven/it/MavenITmng4338OptionalMojosTest.java | 4 +-
.../it/MavenITmng4341PluginExecutionOrderTest.java | 4 +-
...2IndependentMojoParameterDefaultValuesTest.java | 4 +-
...venITmng4343MissingReleaseUpdatePolicyTest.java | 6 +-
...enITmng4344ManagedPluginExecutionOrderTest.java | 4 +-
...enITmng4345DefaultPluginExecutionOrderTest.java | 4 +-
...mng4347ImportScopeWithSettingsProfilesTest.java | 4 +-
...ITmng4348NoUnnecessaryRepositoryAccessTest.java | 4 +-
...mng4349RelocatedArtifactWithInvalidPomTest.java | 4 +-
...Tmng4350LifecycleMappingExecutionOrderTest.java | 4 +-
...3PluginDependencyResolutionFromPomRepoTest.java | 4 +-
...355ExtensionAutomaticVersionResolutionTest.java | 4 +-
...NoNeedlessRelookupFromActiveCollectionTest.java | 4 +-
...4357LifecycleMappingDiscoveryInReactorTest.java | 4 +-
...LocallyReachableParentOutsideOfReactorTest.java | 4 +-
.../maven/it/MavenITmng4360WebDavSupportTest.java | 4 +-
...ITmng4361ForceDependencySnapshotUpdateTest.java | 4 +-
...363DynamicAdditionOfDependencyArtifactTest.java | 4 +-
...avenITmng4365XmlMarkupInAttributeValueTest.java | 4 +-
...venITmng4367LayoutAwareMirrorSelectionTest.java | 4 +-
...mng4368TimestampAwareArtifactInstallerTest.java | 4 +-
...sitiveSystemPathInterpolatedWithEnvVarTest.java | 6 +-
...enITmng4381ExtensionSingletonComponentTest.java | 4 +-
.../MavenITmng4383ValidDependencyVersionTest.java | 6 +-
...LifecycleMappingFromExtensionInReactorTest.java | 6 +-
.../maven/it/MavenITmng4386DebugLoggingTest.java | 4 +-
.../maven/it/MavenITmng4387QuietLoggingTest.java | 4 +-
...nITmng4393ParseExternalParenPomLenientTest.java | 4 +-
.../MavenITmng4396AntBased20xMojoSupportTest.java | 4 +-
.../it/MavenITmng4400RepositoryOrderTest.java | 4 +-
...enITmng4401RepositoryOrderForParentPomTest.java | 4 +-
.../it/MavenITmng4402DuplicateChildModuleTest.java | 6 +-
...enITmng4403LenientDependencyPomParsingTest.java | 4 +-
.../it/MavenITmng4404UniqueProfileIdTest.java | 6 +-
.../it/MavenITmng4405ValidPluginVersionTest.java | 6 +-
.../MavenITmng4408NonExistentSettingsFileTest.java | 6 +-
.../maven/it/MavenITmng4410UsageHelpTest.java | 4 +-
.../maven/it/MavenITmng4411VersionInfoTest.java | 4 +-
.../it/MavenITmng4412OfflineModeInPluginTest.java | 6 +-
...avenITmng4413MirroringOfDependencyRepoTest.java | 4 +-
.../it/MavenITmng4415InheritedPluginOrderTest.java | 4 +-
...ng4416PluginOrderAfterProfileInjectionTest.java | 4 +-
...1DeprecatedPomInterpolationExpressionsTest.java | 4 +-
...g4422PluginExecutionPhaseInterpolationTest.java | 4 +-
...ssionDataFromPluginParameterExpressionTest.java | 4 +-
.../it/MavenITmng4428FollowHttpRedirectTest.java | 4 +-
...mng4429CompRequirementOnNonDefaultImplTest.java | 4 +-
...nITmng4430DistributionManagementStatusTest.java | 6 +-
...avenITmng4433ForceParentSnapshotUpdateTest.java | 4 +-
...MavenITmng4436SingletonComponentLookupTest.java | 4 +-
...ng4450StubModelForMissingDependencyPomTest.java | 4 +-
...4452ResolutionOfSnapshotWithClassifierTest.java | 4 +-
...g4453PluginVersionFromLifecycleMappingTest.java | 4 +-
...ITmng4459InMemorySettingsKeptEncryptedTest.java | 4 +-
.../MavenITmng4461ArtifactUploadMonitorTest.java | 4 +-
...463DependencyManagementImportVersionRanges.java | 6 +-
...ng4464PlatformIndependentFileSeparatorTest.java | 4 +-
...65PluginPrefixFromLocalCacheOfDownRepoTest.java | 4 +-
...469AuthenticatedDeploymentToCustomRepoTest.java | 4 +-
...Tmng4470AuthenticatedDeploymentToProxyTest.java | 4 +-
...enITmng4474PerLookupWagonInstantiationTest.java | 4 +-
...avenITmng4482ForcePluginSnapshotUpdateTest.java | 4 +-
...mng4488ValidateExternalParenPomLenientTest.java | 4 +-
...MavenITmng4489MirroringOfExtensionRepoTest.java | 4 +-
.../it/MavenITmng4498IgnoreBrokenMetadataTest.java | 4 +-
...Tmng4500NoUpdateOfTimestampedSnapshotsTest.java | 4 +-
...4522FailUponMissingDependencyParentPomTest.java | 6 +-
...venITmng4526MavenProjectArtifactsScopeTest.java | 4 +-
...528ExcludeWagonsFromMavenCoreArtifactsTest.java | 4 +-
...nITmng4536RequiresNoProjectForkingMojoTest.java | 4 +-
...544ActiveComponentCollectionThreadSafeTest.java | 4 +-
...4553CoreArtifactFilterConsidersGroupIdTest.java | 4 +-
...avenITmng4554PluginPrefixMappingUpdateTest.java | 4 +-
...nITmng4555MetaversionResolutionOfflineTest.java | 6 +-
.../MavenITmng4561MirroringOfPluginRepoTest.java | 4 +-
...mng4565MultiConditionProfileActivationTest.java | 4 +-
...4572ModelVersionSurroundedByWhitespaceTest.java | 4 +-
...LevelPluginDepUsedForCliInvocInReactorTest.java | 4 +-
...fixResolutionFromVersionlessPluginMgmtTest.java | 4 +-
...ImportedPomUsesSystemAndUserPropertiesTest.java | 6 +-
...ng4600DependencyOptionalFlagManagementTest.java | 4 +-
...mng4615ValidateRequiredPluginParameterTest.java | 6 +-
...enITmng4618AggregatorBuiltAfterModulesTest.java | 4 +-
...5SettingsXmlInterpolationWithXmlMarkupTest.java | 4 +-
...PomValidationErrorUponMissingSystemDepTest.java | 4 +-
...mng4633DualCompilerExecutionsWeaveModeTest.java | 4 +-
...44StrictPomParsingRejectsMisplacedTextTest.java | 6 +-
...Tmng4654ArtifactHandlerForMainArtifactTest.java | 4 +-
.../it/MavenITmng4666CoreRealmImportTest.java | 4 +-
...mng4677DisabledPluginConfigInheritanceTest.java | 4 +-
.../MavenITmng4679SnapshotUpdateInPluginTest.java | 4 +-
...enITmng4684DistMgmtOverriddenByProfileTest.java | 4 +-
...ng4690InterdependentConflictResolutionTest.java | 4 +-
...mng4696MavenProjectDependencyArtifactsTest.java | 4 +-
...4720DependencyManagementExclusionMergeTest.java | 4 +-
...MavenITmng4721OptionalPluginDependencyTest.java | 4 +-
...729MirrorProxyAuthUsedByProjectBuilderTest.java | 4 +-
.../it/MavenITmng4745PluginVersionUpdateTest.java | 4 +-
.../MavenITmng4747JavaAgentUsedByPluginTest.java | 4 +-
...esolvedMavenProjectDependencyArtifactsTest.java | 4 +-
...4755FetchRemoteMetadataForVersionRangeTest.java | 4 +-
...enITmng4761PluginLevelDependencyScopesTest.java | 4 +-
.../MavenITmng4765LocalPomProjectBuilderTest.java | 4 +-
...Tmng4768NearestMatchConflictResolutionTest.java | 4 +-
...refixResolutionDoesntTouchDisabledRepoTest.java | 6 +-
...rsionResolutionDoesntTouchDisabledRepoTest.java | 6 +-
...76ForkedReactorPluginVersionResolutionTest.java | 4 +-
...tipleDepsWithVersionRangeFromLocalRepoTest.java | 4 +-
...nITmng4781DeploymentToNexusStagingRepoTest.java | 4 +-
...4785TransitiveResolutionInForkedThreadTest.java | 4 +-
.../MavenITmng4786AntBased21xMojoSupportTest.java | 4 +-
...ITmng4788InstallationToCustomLocalRepoTest.java | 4 +-
...ITmng4789ScopeInheritanceMeetsConflictTest.java | 4 +-
...rojectBuilderResolvesRemotePomArtifactTest.java | 4 +-
...utionInReactorProjectForkedByLifecycleTest.java | 4 +-
...venITmng4800NearestWinsVsScopeWideningTest.java | 4 +-
...enITmng4811CustomComponentConfiguratorTest.java | 4 +-
...eResolutionOfDependenciesDuringReactorTest.java | 4 +-
.../MavenITmng4829ChecksumFailureWarningTest.java | 4 +-
...34ParentProjectResolvedFromRemoteReposTest.java | 4 +-
.../it/MavenITmng4840MavenPrerequisiteTest.java | 4 +-
...mng4842ParentResolutionOfDependencyPomTest.java | 4 +-
...eactorResolutionAttachedWithExclusionsTest.java | 4 +-
...avenITmng4874UpdateLatestPluginVersionTest.java | 4 +-
.../MavenITmng4877DeployUsingPrivateKeyTest.java | 4 +-
...83FailUponOverconstrainedVersionRangesTest.java | 4 +-
...ng4890MakeLikeReactorConsidersVersionsTest.java | 4 +-
...MavenITmng4891RobustSnapshotResolutionTest.java | 4 +-
...g4895PluginDepWithNonRelocatedMavenApiTest.java | 4 +-
...913UserPropertyVsDependencyPomPropertyTest.java | 4 +-
...g4919LifecycleMappingWithSameGoalTwiceTest.java | 4 +-
...4925ContainerLookupRealmDuringMojoExecTest.java | 4 +-
.../maven/it/MavenITmng4936EventSpyTest.java | 4 +-
...avenITmng4952MetadataReleaseInfoUpdateTest.java | 4 +-
...mng4955LocalVsRemoteSnapshotResolutionTest.java | 4 +-
.../MavenITmng4960MakeLikeReactorResumeTest.java | 4 +-
...venITmng4963ParentResolutionFromMirrorTest.java | 4 +-
.../MavenITmng4966AbnormalUrlPreservationTest.java | 4 +-
...g4973ExtensionVisibleToPluginInReactorTest.java | 4 +-
...975ProfileInjectedPluginExecutionOrderTest.java | 4 +-
...mng4987TimestampBasedSnapshotSelectionTest.java | 4 +-
.../maven/it/MavenITmng4991NonProxyHostsTest.java | 4 +-
...ITmng4992MapStylePropertiesParamConfigTest.java | 4 +-
...nITmng5000ChildPathAwareUrlInheritanceTest.java | 4 +-
...VersionRangeDependencyParentResolutionTest.java | 4 +-
.../it/MavenITmng5009AggregationCycleTest.java | 4 +-
...igureCollectionArrayFromUserPropertiesTest.java | 4 +-
...Tmng5012CollectionVsArrayParamCoercionTest.java | 4 +-
...g5013ConfigureParamBeanFromScalarValueTest.java | 4 +-
...ingBasedCompLookupFromChildPluginRealmTest.java | 4 +-
.../MavenITmng5064SuppressSnapshotUpdatesTest.java | 4 +-
...usionAtDependencyWithImpliedClassifierTest.java | 4 +-
...AggregatorDepResolutionModuleExtensionTest.java | 4 +-
...Tmng5137ReactorResolutionInForkedBuildTest.java | 4 +-
.../maven/it/MavenITmng5175WagonHttpTest.java | 4 +-
.../it/MavenITmng5206PlexusLifecycleHonoured.java | 4 +-
.../it/MavenITmng5208EventSpyParallelTest.java | 4 +-
.../maven/it/MavenITmng5214DontMapWsdlToJar.java | 4 +-
.../maven/it/MavenITmng5222MojoDeprecatedTest.java | 4 +-
.../maven/it/MavenITmng5224InjectedSettings.java | 4 +-
.../MavenITmng5230MakeReactorWithExcludesTest.java | 4 +-
...g5280SettingsProfilesRepositoriesOrderTest.java | 4 +-
.../it/MavenITmng5338FileOptionToDirectory.java | 4 +-
.../maven/it/MavenITmng5382Jsr330Plugin.java | 4 +-
.../MavenITmng5387ArtifactReplacementPlugin.java | 4 +-
...mng5389LifecycleParticipantAfterSessionEnd.java | 4 +-
...Tmng5418FileProjectPropertiesActivatorTest.java | 4 +-
...445LegacyStringSearchModelInterpolatorTest.java | 4 +-
.../MavenITmng5452MavenBuildTimestampUTCTest.java | 4 +-
.../maven/it/MavenITmng5482AetherNotFoundTest.java | 6 +-
.../maven/it/MavenITmng5503ZipInReactorTest.java | 4 +-
.../it/MavenITmng5530MojoExecutionScopeTest.java | 4 +-
.../MavenITmng5557ProperlyRestrictedReactor.java | 6 +-
...5561PluginRelocationLosesConfigurationTest.java | 4 +-
.../MavenITmng5572ReactorPluginExtensionsTest.java | 4 +-
.../maven/it/MavenITmng5576CdFriendlyVersions.java | 4 +-
.../maven/it/MavenITmng5578SessionScopeTest.java | 4 +-
.../it/MavenITmng5581LifecycleMappingDelegate.java | 6 +-
.../maven/it/MavenITmng5591WorkspaceReader.java | 4 +-
...MavenITmng5608ProfileActivationWarningTest.java | 4 +-
...MavenITmng5639ImportScopePomResolutionTest.java | 4 +-
...mng5640LifecycleParticipantAfterSessionEnd.java | 6 +-
...Tmng5663NestedImportScopePomResolutionTest.java | 4 +-
.../maven/it/MavenITmng5669ReadPomsOnce.java | 4 +-
.../maven/it/MavenITmng5716ToolchainsTypeTest.java | 4 +-
...avenITmng5742BuildExtensionClassloaderTest.java | 4 +-
...mng5753CustomMojoExecutionConfiguratorTest.java | 4 +-
.../maven/it/MavenITmng5768CliExecutionIdTest.java | 4 +-
.../maven/it/MavenITmng5771CoreExtensionsTest.java | 4 +-
.../MavenITmng5774ConfigurationProcessorsTest.java | 6 +-
.../MavenITmng5783PluginDependencyFiltering.java | 4 +-
.../MavenITmng5805PkgTypeMojoConfiguration2.java | 4 +-
.../it/MavenITmng5840ParentVersionRanges.java | 4 +-
.../MavenITmng5840RelativePathReactorMatching.java | 4 +-
...MavenITmng5868NoDuplicateAttachedArtifacts.java | 4 +-
.../apache/maven/it/MavenITmng5889FindBasedir.java | 4 +-
...enITmng5895CIFriendlyUsageWithPropertyTest.java | 4 +-
...ildMultimoduleWithEARFailsToResolveWARTest.java | 4 +-
...onalLostInTranstiveManagedDependenciesTest.java | 4 +-
.../MavenITmng5958LifecyclePhaseBinaryCompat.java | 6 +-
...enITmng5965ParallelBuildMultipliesWorkTest.java | 6 +-
.../it/MavenITmng6057CheckReactorOrderTest.java | 4 +-
.../it/MavenITmng6071GetResourceWithCustomPom.java | 4 +-
.../maven/it/MavenITmng6084Jsr250PluginTest.java | 4 +-
.../maven/it/MavenITmng6090CIFriendlyTest.java | 4 +-
.../it/MavenITmng6118SubmoduleInvocation.java | 4 +-
...uginExecutionConfigurationInterferenceTest.java | 4 +-
.../MavenITmng6173GetAllProjectsInReactorTest.java | 4 +-
...ITmng6173GetProjectsAndDependencyGraphTest.java | 4 +-
...MavenITmng6189SiteReportPluginsWarningTest.java | 4 +-
...venITmng6210CoreExtensionsCustomScopesTest.java | 4 +-
.../apache/maven/it/MavenITmng6223FindBasedir.java | 4 +-
...avenITmng6240PluginExtensionAetherProvider.java | 4 +-
.../maven/it/MavenITmng6255FixConcatLines.java | 4 +-
...nITmng6256SpecialCharsAlternatePOMLocation.java | 4 +-
.../MavenITmng6326CoreExtensionsNotFoundTest.java | 6 +-
.../maven/it/MavenITmng6330RelativePath.java | 6 +-
.../it/MavenITmng6386BaseUriPropertyTest.java | 4 +-
.../maven/it/MavenITmng6391PrintVersionTest.java | 4 +-
.../it/MavenITmng6506PackageAnnotationTest.java | 4 +-
...MavenITmng6511OptionalProjectSelectionTest.java | 6 +-
.../MavenITmng6558ToolchainsBuildingEventTest.java | 4 +-
...ecuteAnnotationShouldNotReExecuteGoalsTest.java | 6 +-
...ITmng6609ProfileActivationForPackagingTest.java | 4 +-
.../maven/it/MavenITmng6720FailFastTest.java | 6 +-
...avenITmng6754TimestampInMultimoduleProject.java | 4 +-
...ng6759TransitiveDependencyRepositoriesTest.java | 4 +-
...avenITmng6972AllowAccessToGraphPackageTest.java | 4 +-
...ng6981ProjectListShouldIncludeChildrenTest.java | 6 +-
.../apache/maven/it/MavenITmng7038RootdirTest.java | 6 +-
...nITmng7045DropUselessAndOutdatedCdiApiTest.java | 6 +-
.../it/MavenITmng7110ExtensionClassloader.java | 6 +-
...MavenITmng7112ProjectsWithNonRecursiveTest.java | 6 +-
...MavenITmng7128BlockExternalHttpReactorTest.java | 6 +-
.../it/MavenITmng7160ExtensionClassloader.java | 6 +-
.../maven/it/MavenITmng7228LeakyModelTest.java | 4 +-
...MavenITmng7244IgnorePomPrefixInExpressions.java | 6 +-
...310LifecycleActivatedInSpecifiedModuleTest.java | 4 +-
.../MavenITmng7335MissingJarInParallelBuild.java | 6 +-
.../it/MavenITmng7349RelocationWarningTest.java | 4 +-
.../it/MavenITmng7353CliGoalInvocationTest.java | 4 +-
...enITmng7404IgnorePrefixlessExpressionsTest.java | 6 +-
...ITmng7464ReadOnlyMojoParametersWarningTest.java | 4 +-
...nITmng7468UnsupportedPluginsParametersTest.java | 4 +-
.../it/MavenITmng7470ResolverTransportTest.java | 4 +-
.../maven/it/MavenITmng7474SessionScopeTest.java | 4 +-
.../maven/it/MavenITmng7487DeadlockTest.java | 6 +-
...mng7504NotWarnUnsupportedReportPluginsTest.java | 6 +-
...enITmng7529VersionRangeRepositorySelection.java | 4 +-
.../it/MavenITmng7566JavaPrerequisiteTest.java | 4 +-
.../org/apache/maven/it/MavenITmng7587Jsr330.java | 4 +-
.../MavenITmng7606DependencyImportScopeTest.java | 4 +-
.../it/MavenITmng7679SingleMojoNoPomTest.java | 4 +-
.../maven/it/MavenITmng7697PomWithEmojiTest.java | 4 +-
.../maven/it/MavenITmng7716BuildDeadlock.java | 4 +-
.../it/MavenITmng7737ProfileActivationTest.java | 4 +-
...MavenITmng7819FileLockingWithSnapshotsTest.java | 4 +-
...avenITmng7939PluginsValidationExcludesTest.java | 4 +-
...avenITmng8106OverlappingDirectoryRolesTest.java | 4 +-
.../org/apache/maven/it/TestSuiteOrdering.java | 2 +-
.../maven-it-plugin-project-interpolation/pom.xml | 4 +-
core-it-support/maven-it-helper/pom.xml | 19 +-
.../maven/it/AbstractMavenIntegrationTestCase.java | 2 -
.../org/apache/maven/it/ResourceExtractor.java | 145 +++
.../org/apache/maven/it/VerificationException.java | 33 +-
.../main/java/org/apache/maven/it/Verifier.java | 1006 ++++++++++++++++++++
pom.xml | 6 +-
647 files changed, 2543 insertions(+), 1382 deletions(-)
diff --git a/core-it-suite/pom.xml b/core-it-suite/pom.xml
index e6e37a9ef..78827275a 100644
--- a/core-it-suite/pom.xml
+++ b/core-it-suite/pom.xml
@@ -104,8 +104,8 @@ under the License.
<!-- NOTE: Use compile scope for transitivity. -->
</dependency>
<dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-verifier</artifactId>
+ <groupId>org.apache.maven.executor</groupId>
+ <artifactId>maven-executor</artifactId>
<!-- TODO: not transitive in tests artifact, so must be left in main
scope <scope>test</scope> -->
</dependency>
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 740339a53..149180bf1 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenIT0008SimplePluginTest extends AbstractMavenIntegrationTestCase {
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 805f1256f..d5a37c84a 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIf;
import org.junit.jupiter.api.condition.JRE;
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 a59b04316..9830de61a 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenIT0010DependencyClosureResolutionTest extends AbstractMavenIntegrationTestCase {
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 e3338a5b4..b2c58b9c5 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenIT0011DefaultVersionByDependencyManagementTest extends AbstractMavenIntegrationTestCase {
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 5d8766650..10b25c8b4 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenIT0012PomInterpolationTest extends AbstractMavenIntegrationTestCase {
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 e34002d68..7feecbafd 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenIT0018DependencyManagementTest extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java
index 4367cdad6..a545f3c90 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenIT0019PluginVersionMgmtBySuperPomTest extends AbstractMavenIntegrationTestCase {
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 74e63084f..fc29ae5ac 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenIT0021PomProfileTest extends AbstractMavenIntegrationTestCase {
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 72e59e2b8..4c6651537 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenIT0023SettingsProfileTest extends AbstractMavenIntegrationTestCase {
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 76f68d175..bb887a740 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 61dd1145a..6ba8ce8c3 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java
index aa7b04ebf..3db453dbb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenIT0030DepPomDepMgmtInheritanceTest extends AbstractMavenIntegrationTestCase {
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 928193b33..161fcb555 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenIT0032MavenPrerequisiteTest extends AbstractMavenIntegrationTestCase {
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 59b512e21..1285d00de 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 cddb8c3a4..131d26921 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 3a5588320..0c0496547 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 0943b03bf..a9ef5fb5b 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 1911a5d88..8841c11a2 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenIT0056MultipleGoalExecutionsTest extends AbstractMavenIntegrationTestCase {
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 1f60680f3..670b870f8 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenIT0063SystemScopeDependencyTest extends AbstractMavenIntegrationTestCase {
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 500313c42..7a331a738 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenIT0064MojoConfigViaSettersTest extends AbstractMavenIntegrationTestCase {
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 68d1e9744..e3c7d9fb1 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 fb47fcaef..f33738ac3 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 33da96873..881dc45ef 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
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Collection;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenIT0085TransitiveSystemScopeTest extends AbstractMavenIntegrationTestCase {
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 a09d92556..785d0e389 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 f0fb91129..f98bc2b74 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 78d661059..46ac82e23 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenIT0090EnvVarInterpolationTest extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java
index aaacc4763..4b5cba698 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java
@@ -26,9 +26,9 @@ import java.util.Date;
import java.util.Locale;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
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 63d8218b7..fd4cf1850 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest extends AbstractMavenIntegrationTestCase {
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 8f49ff0d0..e5808f058 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 b9a5ebc22..1816ed066 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 6ad27808a..4a62b394f 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 c2156f118..6768acb20 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 f2b877a72..fee7c8ad4 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 2ee41efee..51fa4d002 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 95ecf5b6e..6633fe946 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 422466f7e..cf42ad2dd 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 ebe274f5b..622ea2c53 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 5c82e4391..2f0da7d27 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 a8d50e14b..dda9c6ed0 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 fc2d56fdd..8cb7f8f2d 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 7b1aebc2c..f6a5d35d2 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.List;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 340f45ae6..a29d3830c 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
index 26b97beb0..290b0b827 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
@@ -23,8 +23,8 @@ import java.io.IOException;
import java.net.InetAddress;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Server;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java
index 6021b676f..21d60af04 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenIT0199CyclicImportScopeTest extends AbstractMavenIntegrationTestCase {
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 2e30525b6..8fff54b3e 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.java
index ab75fc7e1..80aff08a6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10937QuotedPipesInMavenOptsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10937QuotedPipesInMavenOptsTest.java
index 00a2bb2db..bac9416c5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10937QuotedPipesInMavenOptsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10937QuotedPipesInMavenOptsTest.java
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Properties;
import org.apache.maven.shared.utils.StringUtils;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
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 716513642..035749e96 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
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 b579e9294..132423d73 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
@@ -25,8 +25,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 edbc5b841..8808e1a73 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 9f02ad1c6..ee0a24fd1 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 3ec17fbd9..fb43a0a51 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 49538bf47..13d9829b1 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 797fbbb8a..a25e9467e 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 f8dbeb33c..22473a38f 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 023083e31..44e2d5d2e 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 5deef8815..c79a5e4b1 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 256c9c4ad..01714b7f5 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
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 9b156f3e0..79d709ae1 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 676633f5f..0c2012a95 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Collection;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 f5d626548..a6ee23a1e 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 096c46291..e69d9641e 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 9508923a8..ee6f95747 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
@@ -23,8 +23,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.security.HashLoginService;
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 6f8047405..8f0559a8d 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 d0d0a6947..970fe44b9 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
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 dfc9b2c90..57126c5af 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 68c478045..51fa11f41 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 15373739b..76681a677 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 78cbe1bcc..aec828368 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 4b6689b3b..6fc89fb13 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
@@ -29,9 +29,9 @@ import java.util.Collections;
import java.util.List;
import java.util.Properties;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
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 70380b77f..8640cc8d3 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 5f710a1f5..061ea8ec2 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 42bbf9525..e764ed731 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 77d54f0cd..4c302c448 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 95faf9af0..2421da1eb 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Collection;
import java.util.Collections;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 42f798a83..cb342fd31 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Collection;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 be446da28..a10726604 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java
index f5b043868..e58135478 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java
@@ -24,8 +24,8 @@ import java.util.Date;
import java.util.Locale;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 fc9e9f2f8..f4dc4c95a 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
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java
index 8cb8f4912..1a5f1f73d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 562c6412b..2ad1f7146 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 522d9a015..a0bef3c45 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 786fe5e8c..18ad20092 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 fcbe0fc87..423272c8d 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java
index a1fbd26a1..e63b03943 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 b282b97e3..1d719dde9 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java
index 0582fce93..e99e7c556 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 abbde7041..b75a45c5e 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 e457de456..b7473529c 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 91e8fad21..c8b82bfc4 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 2b51a3e49..926c754ee 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 2163ebb99..fa7d3d381 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Collection;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 888a8d92d..ada3ce6a4 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 65c670e74..3807b8eeb 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 709b33366..0a00df13a 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 e6a8a1a24..2c8bf589a 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 92b98de95..3a8b92b79 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
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 e35dd4713..3f61e8c70 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 f5431e275..c8a61b2ca 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
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 d8e31365d..e8a4bc251 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 41addbd18..dc1842ec1 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Properties;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 7f1660317..ecb3028b0 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.List;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 d0dd94d5b..6d5f8b334 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.List;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 29c6cedd4..a6c96a498 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 c06fbb756..7f3c8d891 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 acc095d98..233025208 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 d0760828e..61f1af87f 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 beb0b29cd..e249ee294 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 0da02efda..3ab31ae3e 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 6f9f3c0fd..7d98978e0 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 840baf251..c79514fcc 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 c56a882d2..7d2c694bc 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 9332e2718..a6b9c899a 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 2f120fe5b..85683fedc 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 176d8b172..3b4481173 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 7c170e0a2..0f7d89074 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 be3fff25b..8e3dfa7ad 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 09f8e1e46..b770fc50d 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 7a9c65637..7bd25be9e 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 f88b05823..62062c880 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 d82c34af1..61fa85807 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
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
index ef5029669..974993b94 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
@@ -22,9 +22,9 @@ import java.io.File;
import java.util.List;
import java.util.regex.Pattern;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng2199ParentVersionRangeTest extends AbstractMavenIntegrationTestCase {
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 a7431714e..b9e2680c5 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 2a97e34fe..fddb44e63 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 4e6c91f22..004fad5e7 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 9dde813e6..01ce64b8f 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 db82bec8b..3861b9dd6 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 e5a5b522c..8e9bcabe7 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 cc077be04..797d14808 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 3ade494f2..e16f9bd76 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
@@ -27,8 +27,8 @@ import java.io.PrintWriter;
import java.util.List;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.NetworkConnector;
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 ae5c30b3e..45421a6a7 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 62bbe96a5..198e31eb1 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 fd95d1748..7c42d1c63 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 cfa240138..0d1b4a1ac 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 5667b2b93..5e9baa09c 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 fb7bc464b..12f5cdeb2 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.net.InetAddress;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Server;
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 78594937e..590629fcf 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 6fba8a255..fd182cab7 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 9775616b5..bbc648ab4 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
@@ -23,8 +23,8 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 4b0426996..9a0dcf862 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 1fddb9fb7..7bfa21441 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 1e6966f7a..26c0fe9bb 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 c9a410451..93dc1b6a9 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 55ecd507a..fe1d650a2 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java
index 25c3cddd1..64f833139 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java
@@ -23,9 +23,9 @@ import java.io.IOException;
import java.util.List;
import java.util.regex.Pattern;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 4835a865c..ff677eb3c 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 cf863cf73..1aea8f456 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java
index 8d85adfec..cf1f74eea 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 9eb1af17e..578596773 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 efc037949..13c691f7f 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
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 a82bbe031..8d052d4b6 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
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 c5b752f70..664a95e41 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 6daf9fa87..f61f3a4cb 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 e55cec9e3..4406da886 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
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 48b389518..2cc1fa24b 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
@@ -24,8 +24,8 @@ import java.util.Date;
import java.util.TimeZone;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 6475affe9..f57996c8b 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 241dada72..f7261d683 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 b2b00a439..d4f85f824 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 55d71e680..4df3f8269 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 11c0a1abb..7f435da55 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 32fe41788..087ccc670 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 23104d49c..d2b243944 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 fcfae013e..32cffc480 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 5b84e4699..60c85b40e 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Collection;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 95f7f8f7f..6c3867fcf 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 48eacb0f1..3720c2166 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 9ee5c8f3f..0027e9ced 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 f5822f579..9d3aa0dea 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
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 2f806e048..84994834d 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 7f3cc4488..684211544 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
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 ea2cf9fc2..9fb1cf616 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
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.io.IOException;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
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 d3a098798..c7127120f 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
index 629056848..d2fadfe47 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 ebbf0d5c4..4f0243045 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
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 2bc267646..d0e131073 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 af2bce344..1dae63182 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 095c4e736..2393b856b 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 6db357035..339f6e6a5 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 79230298b..d7a00f28e 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Collections;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 f90ba8ebb..81b8150a2 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
@@ -23,8 +23,8 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 0d72c6906..e7d5e51fb 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 82854602e..78ea088ef 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 ea7876650..b2e33ae72 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
index b465e406d..dd9bb5de6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 0367992fd..47f78e681 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 d3c9d6be8..e9fb66541 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 8c3baa1bd..97703639b 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 d44c979d7..bb1ff797f 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
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 e56473463..f89342192 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.List;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 753b736a3..818989a61 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 2c56bad48..1f796c1ce 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 8e02604d5..b88f2faff 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 c62c8f300..af4df7eba 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 88ca44089..ce3a91f6b 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 f9d461dd1..c1e91740d 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 6f7795915..742738421 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 9e34f8d59..9d3e424c7 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 225c2d9ea..e080224b1 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 432c1e2c2..9c889bb98 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
@@ -28,8 +28,8 @@ import java.util.Map;
import java.util.concurrent.ConcurrentLinkedDeque;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
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 062f13d0e..c511b62fb 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java
index 5a976b97d..c0c4d14b8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java
@@ -23,8 +23,8 @@ import java.io.FileReader;
import java.io.IOException;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
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 90b8ec6a3..6af1ffd1a 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
@@ -25,8 +25,8 @@ import java.io.File;
import java.io.IOException;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java
index 6d0c8e75d..0ba51b976 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 d74e7c6ad..87e6e38f4 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.io.IOException;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 746e3311e..4c3fa115a 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
@@ -23,9 +23,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Server;
import org.junit.jupiter.api.Test;
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 1cd06f2a2..57aa16990 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 ec9873a8e..8ce82b9c3 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 a2013af9d..a132ef5f1 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java
index 62f4ac0a9..af265f42e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
index ada97222a..360761715 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.io.IOException;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 18be2b43c..bb2b66ba1 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 c9109879d..c45082aa9 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 ea2807b6c..ee8d3bd68 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,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 bd5d7bfee..0f17ba919 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 d385946bf..b68c3f82a 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 7ff9047b3..2ccd3ea92 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 463f876f5..5e7b44ec6 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
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 617ac2ba4..3146f8c7a 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
@@ -26,8 +26,8 @@ import java.io.IOException;
import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
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 3203f3923..84d41cab5 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 f7dea97aa..b2b441d3e 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.net.URI;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 f4b34dff7..ba1c0eaa3 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java
index b4fd7d787..bf73c2804 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.List;
import java.util.regex.Pattern;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 4ee7b841d..570cac62e 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 24e7a44a2..46ee8bd98 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
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 d25b6fc9a..ff2d543f7 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
@@ -25,8 +25,8 @@ import java.io.File;
import java.io.IOException;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
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 485063b15..4c6e42d72 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 7df5e2d5c..9d382dfac 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 bdeed493f..607a2fd36 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 1fe7007bc..e6ceb9218 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 6eac610d0..92b44383f 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java
index d65a6edd2..25af94b1c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 92308df21..a0167795d 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 bfb5beb66..52f8d8569 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 67d4cd926..dd772f253 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 490bd9384..9a3d75ff5 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 1b8299e5c..aac5c23a5 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Map;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 25eeb4094..47bd0d4e5 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 775bc360e..fc0e20fc3 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
@@ -23,8 +23,8 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 0183c9f4c..8dd96f99f 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 a66eda022..4e9ac5eb1 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 4f1ac7932..da084bcd5 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 8a4e511a7..33b816ff2 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
@@ -25,8 +25,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 8e5410237..ac546778c 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 eae8ae400..ef268299d 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 6d0445ceb..7b731ebbd 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 bf1ffec36..33ac8d11d 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
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 0c3deae87..0815d3afd 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 64c4d38ca..3814a1536 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 bfc174d34..b64fd20c6 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 eb9737899..dcbf26b88 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 4021fdba0..0a946326f 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 082f54088..f7e59fed4 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java
index 255b4a5cb..e37b9409f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 9bc8dae31..7d0221d14 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 0b22d85a8..e92689e5d 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 6a7b64f48..4b95d298e 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 d39cbe18c..97a764d2f 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 668793703..41422c05d 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 d8e7ee3b1..7f31422e1 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 7224b4316..2052d4082 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 5c03a62c9..97f937eee 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 1e88f4a0f..0cf4b6d79 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 af8c9f4b9..754cc33e5 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 4f5848727..70c86dfac 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 d22db371d..ed7447ed3 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 cc581117b..3c0ae038c 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
@@ -23,8 +23,8 @@ import java.util.Collection;
import java.util.Properties;
import java.util.TreeSet;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 eaf8cb962..c14754cb5 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 835dce4d9..47b830a9b 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 ad9393d16..05b812adc 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 ce8e525ea..3557922e4 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 39184a443..ebc9d4d0f 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
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 527799407..91f5cc74a 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 ef8e2dbfb..176f2eb78 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 fc054957e..e809b9382 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 d3d6f6dbf..e4b6fe218 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 a05603576..ef4c31973 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.io.IOException;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 ec568d70a..cbdd11c56 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 5e4dca64c..1d3de2cf3 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 9ad5bb332..0444409c8 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
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 f2bc3767b..6b9696e7a 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Locale;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 23a421261..90a5db8f3 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 f7b06eead..8f8db3a6d 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java
index 135f1ed6d..537e00d32 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 5ce9b4438..fcb2c5fe0 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 99f0d9013..67c3a7260 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
@@ -23,8 +23,8 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 d3194efde..c0084b8f8 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 67321063f..d849da107 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 22c80a4ff..8ee166b2b 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 80db3543b..6622ca3a1 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 b81b3e363..8ad5cfbad 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 f96704f78..8086a4cc0 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Properties;
import org.apache.maven.shared.utils.Os;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 1930d8b6f..b4d775095 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 00a761d08..bcaa60073 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
@@ -23,8 +23,8 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 e8ce918c4..73ab10e9d 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 4e2ba32fd..41d11ab28 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 e8c6bec71..274201fc9 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 058dd59c4..fb24d202f 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 bb53d856c..a7f78f915 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
@@ -23,8 +23,8 @@ import javax.servlet.http.HttpServletResponse;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.security.HashLoginService;
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 79b6f2a29..eb8425da3 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 491fa5901..6076f9a72 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 f2d0a23bc..bb8f71f38 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 e95281139..a4017d9fc 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 8410fcdcb..4c059e9cc 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 87fcb3732..018db6960 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 7cec97435..856a24965 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
@@ -23,8 +23,8 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 9c742df4b..908a349b8 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 ebff7e8f8..67f05a98e 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
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 b4347761d..bcbe60665 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 74d371bbc..6888d89dd 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 d2e48e4da..66eddb9bb 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 108427c54..74a699736 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 6d80de8c6..1e9633c79 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 70bd23f82..3d22701aa 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 55c9edcef..5b12b00f6 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 e83adbc1a..c8cd02519 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
@@ -23,8 +23,8 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 89071fbf3..371af8349 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 61452e89c..42dc2affc 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 ba4a0932a..043b1df1c 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 69fa365d2..97f777b17 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 885c084d9..91b0ecc77 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 5ffa82b31..dfc40399e 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 4811de54f..eb6a5b8d2 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.HashMap;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.security.HashLoginService;
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 fe495ea9c..2375ee91e 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 d72e4746f..e3252e8f2 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 429769629..a809ce6e5 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java
index 4a1c21bf9..ced057f09 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java
@@ -22,9 +22,9 @@ import java.io.File;
import java.util.List;
import java.util.Properties;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 0d0525ecc..c9a851515 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 61998ee37..1ea74b211 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 0faa06f34..312cf3bb1 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 9c0aa1f62..8def9b272 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng4112MavenVersionPropertyTest extends AbstractMavenIntegrationTestCase {
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 3ac362648..0c76eb81f 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 daaec472e..5f47aaaa6 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
@@ -23,8 +23,8 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 69e7f9221..f92e78dba 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Collection;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 db55f250a..e25b448ed 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 fd27b1c23..ca3bd112d 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 98766b407..b83c01a06 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 db708216d..02233ef5f 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
@@ -23,8 +23,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
index 3efa29ade..67a6c7803 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 c20c4af71..be52b8549 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
@@ -24,8 +24,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 1105a2767..7f98ed20b 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
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 17f892761..cc3ea1e55 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 365f61a67..90f3a0d41 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 494e8f21b..99eff917d 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
@@ -23,8 +23,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 0ba2ee009..3b16cff26 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 0e01d707a..77f1087f3 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 8816f951b..90063b6a5 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 b5323a2af..e0a1ba48d 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Map;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 cc7fddfa9..2e62961e9 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 2cc2e4f31..5a533373b 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
@@ -31,8 +31,8 @@ import java.util.Map;
import java.util.concurrent.ConcurrentLinkedDeque;
import org.apache.maven.it.utils.DeployedResource;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.codehaus.plexus.util.StringUtils;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
index c91c43047..f7eba2fd7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.io.IOException;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 a6550b2dd..f56d22ef4 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 e6448d949..f2fdca9c2 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 6d884d64d..6bcd6f0c0 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java
index 7af19e1c5..5b6da73da 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.io.IOException;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 f2632bab1..5fe0d155c 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 24336f7c6..b83901831 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 185ca523d..54b426122 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 9f8abe45d..6aa472b43 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 d9864f045..5c8351777 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 d1a4a2b0c..72cdbc8fe 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
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 775105d2e..8f619233e 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
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 a4c8f56b4..540ee9dff 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 00b98b49f..016e0b325 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 120b775a6..c0423d4f5 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 64e08c942..1be17ab98 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 ef62c11d5..179f48fc0 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
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 cdc0c7c41..eb8d56658 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 51d598912..a7e7771d7 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 1cee67248..f30ad88bf 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 d74a86a30..2230fd950 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 18fd0ff10..ee0380848 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 31f53fad7..a07a3ee35 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 55093aa0b..e4971fb29 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 cf69f32b0..056f1eaaa 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
@@ -30,8 +30,8 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentLinkedDeque;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
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 560f124f2..9a49316e2 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 17b98af6d..abe5328d5 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 1e43cf3ea..d709c6f04 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 54be0b604..f97377f44 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 7dae138fb..99c96f922 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
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 4696572f5..db343c738 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 d943d4597..acb851655 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 7b6658ee3..cbb9e0c92 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 b1cb5c3fb..b325aad0b 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
@@ -28,9 +28,9 @@ import java.util.Deque;
import java.util.Map;
import java.util.concurrent.ConcurrentLinkedDeque;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
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 aeefb9758..9c45fa1a2 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 c7ad9a183..b22f54509 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 849ed20e1..ef91182dc 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 e3e655a93..1cf65016c 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
@@ -27,8 +27,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
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 d3ebea5c5..dd675463d 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 5c59ed546..866693fe9 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 2957da278..6eb02067d 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Map;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java
index 965ff38f8..d9aeeb180 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 8db8694de..384b33456 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
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 1375f4be6..06d39e48d 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 a7be6cc96..e019038df 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 4f2e43a00..38ae8e311 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
@@ -27,8 +27,8 @@ import java.io.PrintWriter;
import java.util.List;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
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 3915c26a4..7ca3becd8 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Map;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 6243cf991..f8916067f 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 c142568c0..b326255ae 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 eb15cc870..4e54a9340 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 e622eef5c..9f27a3a96 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 2fc3ccc92..a4b8e42cb 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
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 31144f85d..30eecc260 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 b697ad3fd..a100aa5bd 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
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 1089773e5..7e952c246 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
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 acdde6da2..3cf0f8b9a 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 dcedb6180..806b2b4ef 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
@@ -23,8 +23,8 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 d68acfef8..b7a7e1a8e 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 4e8ee0661..c5d8f4032 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 4b7d26dd8..7351aa93d 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 751fc3d8e..63aaeee43 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 c24130de0..dfc459d86 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
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 bafcb7440..2ea6faa38 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
@@ -23,8 +23,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 246e21744..3e6212934 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
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 7470977e7..d4a67a7ac 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
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 450ae9cde..19eb1f8b2 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
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 a583088f0..5105b72fd 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 202605539..028930648 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 ba09fe6eb..aca4745ff 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
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 00e36f68e..5fd02567f 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.security.HashLoginService;
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 626c1f3cf..36412adca 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
@@ -23,8 +23,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 32f1b0df7..6791bb7f5 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
@@ -23,8 +23,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 9248b3cb1..d90a17c6a 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
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.List;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 805e6b6b7..effb8fc75 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
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 c2f018fc7..fbbf350e0 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 a35703f24..439daf5e8 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
@@ -27,8 +27,8 @@ import java.io.PrintWriter;
import java.util.List;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
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 09a94107c..2f31eeea0 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 29efcd5df..9fe648f71 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
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
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 6d64a57e6..2b108e84d 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
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java
index c0fc80c97..29f8d5602 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java
index 60aa1db9c..de8d1ae5c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java
index f37242ff3..28edfa9b8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java
index 1358df786..cdf24c9ad 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java
index 20cbe8eec..73835fa20 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java
index d44b9daba..ab93086ee 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java
index 0cfc5a379..0f2a6e690 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java
@@ -22,9 +22,9 @@ import java.io.File;
import java.util.List;
import java.util.regex.Pattern;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java
index e79cf46e0..9218d07c3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java
index 7b50fadf8..943d35196 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Collections;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java
index 183049df4..16f81c778 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java
@@ -23,8 +23,8 @@ import javax.servlet.http.HttpServletResponse;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.security.HashLoginService;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java
index c56d06536..4f98c07a6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java
@@ -29,8 +29,8 @@ import java.util.Deque;
import java.util.concurrent.ConcurrentLinkedDeque;
import org.apache.maven.it.utils.DeployedResource;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.codehaus.plexus.util.StringUtils;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java
index a95451abd..030e8f5a2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java
index a537750a0..f33aa2d84 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Map;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java
index f69052fbb..29547da8d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java
index 1931e45d2..aeb899a76 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.security.HashLoginService;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java
index 9289c3209..fe1b9edbe 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java
index ab0ad0cc5..c2ce8aeca 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java
@@ -27,8 +27,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java
index a46f800a3..820d32e7f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java
index 8642583c9..4a580be3e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java
index a68b9b86a..8b4e8ee01 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java
index 321f45dd1..217247143 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java
index 81fa5879f..dc0c03354 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java
index bf7822730..c30c02b9d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java
index fefed4676..84c803ebb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java
@@ -29,8 +29,8 @@ import java.util.List;
import java.util.Map;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java
index cf850acaf..2e0a7b932 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java
@@ -26,9 +26,9 @@ import java.util.Deque;
import java.util.Map;
import java.util.concurrent.ConcurrentLinkedDeque;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java
index d9e9dcc4a..74b15b834 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.security.HashLoginService;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java
index faaf8559e..acbd51134 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java
index 4f80fb15f..070c13590 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java
index 3321705c9..2f40e4c66 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java
index 2d2ed4f2f..d9f952128 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java
index 629b32843..4ecd986d0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java
index d8da02c1d..ed8b864d1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.List;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java
index 90b96cdef..d3333cfdf 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java
index a9b7ac999..6597d3f96 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java
index 9c9422768..13cf094a1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.codehaus.plexus.util.Os;
import org.junit.jupiter.api.Test;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java
index 501fb6b7c..d09733c1f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java
index cf840937a..7704fd45c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java
index 0e6f1b73c..0cdf52918 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java
index 5d0c06a36..0d46c9544 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java
index b7f592b1e..2dd3790d7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java
@@ -23,8 +23,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java
index 3b5f237a7..883e0fc25 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java
index 6ed35c03e..62c977d77 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java
index e41e9b0dd..ed5d975a2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java
index f4ca2e088..ac25c23e6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java
index bf3b08d38..eeb0f54bd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.HashSet;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java
index 34810b4b3..9b6b2ff1d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java
index eb2f2e984..24439ef81 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java
index 370fde08e..2b99d9943 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Map;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.security.HashLoginService;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java
index 70ca53e14..5dc02c084 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java
@@ -23,8 +23,8 @@ import java.util.Map;
import java.util.Properties;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java
index b5eb4cd93..4c3a4b897 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java
index 105437f1a..be52d0554 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java
index 513b016a9..140c931f4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java
index 9b282653f..1dea625bd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java
index 9295741a2..7b21459cb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java
index 07a17c46d..4977874bb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java
index 1de286411..48cc3aa7a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java
@@ -26,9 +26,9 @@ import java.util.Deque;
import java.util.Map;
import java.util.concurrent.ConcurrentLinkedDeque;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java
index aea30bd82..8c8069cb9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java
@@ -27,9 +27,9 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java
index 956b66012..9cce2928b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java
index 4224a30fd..0c32848d2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java
index 2c93aa7f7..bdf1fb230 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java
@@ -25,8 +25,8 @@ import java.io.File;
import java.util.Deque;
import java.util.concurrent.ConcurrentLinkedDeque;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java
index 144504a93..fd0a7685f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java
index ae39710ca..4157be6b0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java
index f69f1be2f..6ba2d124e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java
index b1124331f..488be44b3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java
index c27ec6971..3e1ea2e77 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java
index 7c08213ca..3d63139f6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java
index fae02a1af..381a9f3c3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java
index 8d238034d..02d971539 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java
index e70267c28..b87bf6caa 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java
index 6954018de..4970421f4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java
index 2bdefe27b..1725f673d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java
index 802548298..aa5d20075 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java
index f4bf7c337..d1761e33f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java
index dc56b6244..5991d2334 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java
index 7f5b3aa9c..db9aa4a2e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java
index bc993f957..cec46237d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java
index 38a1055f1..43f0d8116 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java
index b97ed2d8e..167bfe32d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java
index 83fb0dba3..4bcc09671 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java
index 10989807a..0c8a0199c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java
index e16f90d15..43a597e86 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java
index ecf9df1f0..4691b3501 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java
index 191e13544..faf1cc9df 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java
index b9b597de9..0c036d3d8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java
index 77b84dc1c..7b2584cb2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Map;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java
index a119b465c..84fa4636c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java
index 5b57225b8..21aeef07d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java
index b3a839de3..6898d82c3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java
index e225bebd3..7838099bc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java
index 193187577..f02506f25 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java
index 415862763..45b934cfc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java
index 0bd58022b..70e1cf558 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java
index c5c1a33f7..5bfd8b13f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java
@@ -23,8 +23,8 @@ import java.net.InetAddress;
import java.util.List;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Server;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java
index 606feeaf8..b930d58e7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java
index 36a2e4463..010d4b267 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java
index 117f7ebfb..3df317bc0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java
index 893ca3bb0..968e2f6f4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java
index 353d1c5ad..28e95593d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java
index 449bc96ca..296968f1c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java
index 64366ec94..aad8530fd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java
index 41bf37198..7fe707299 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java
index 697cee2dd..b16e4baad 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java
@@ -27,8 +27,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java
index ee0a02818..72bb67ff0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java
index b08ccd3bc..62a13fd99 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java
index 57b3c2380..659581ea0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java
index 60a93dd8d..2d349381c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java
@@ -27,8 +27,8 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java
index 52cacec1d..ed56684b5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java
index 5e2017a5e..89529e1f8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java
index 0d7dc6cc6..a138cbc70 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng5214DontMapWsdlToJar extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java
index 62fe81c32..fb4da50c0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java
@@ -24,8 +24,8 @@ import java.util.List;
import java.util.Properties;
import java.util.regex.Pattern;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java
index 26c1b171f..c3ec9d69a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java
@@ -23,8 +23,8 @@ import java.io.FileReader;
import java.util.ArrayList;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
import org.junit.jupiter.api.Test;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java
index 6f1d987e1..fe76c03f2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java
index bd4ab1cc3..7972c2c3a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java
@@ -29,8 +29,8 @@ import java.io.OutputStream;
import java.io.PrintWriter;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java
index e9ce69d16..d5aa6c3b6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java
index 86d96cf4c..3d7277296 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java
index 91da281d6..673ab85cd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java
index 627fab9d1..8e42edecb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng5389LifecycleParticipantAfterSessionEnd extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java
index a3e0aeb4b..543e11d28 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java
index e6fbc70ed..8513591ac 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java
index b9140a979..69d48a8f4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java
index 1daa1ada6..bbdf10d55 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java
@@ -23,9 +23,9 @@ import java.io.IOException;
import java.util.List;
import java.util.regex.Pattern;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java
index ade247ee6..9b13a4b20 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
index a800fbea9..b4d7e926e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng5530MojoExecutionScopeTest extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java
index b04bdf479..ac5c64d6c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java
index 92df7b693..d31abaec3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng5561PluginRelocationLosesConfigurationTest extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java
index 30068d69b..5f2d24f6e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java
index 61c1bf483..b87ac72b3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.List;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java
index eaa2521c8..dbe12d63e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng5578SessionScopeTest extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
index fab800017..e4d89075c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng5581LifecycleMappingDelegate extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java
index dc6331323..e7efba8a6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng5591WorkspaceReader extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java
index 0681c6df4..76d825816 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.List;
import java.util.regex.Pattern;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java
index 48c0713a1..d7320f157 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java
index e607ba60c..5197da144 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java
index 533813a5e..e2791af65 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java
index 5169e06e9..85f3dce2c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java
@@ -26,8 +26,8 @@ import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java
index 6a327582a..b242a6561 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Map;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java
index 76926908b..9958d76aa 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng5742BuildExtensionClassloaderTest extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java
index 7a1505a06..b21b26130 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng5753CustomMojoExecutionConfiguratorTest extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java
index 1110c5f41..655712994 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng5768CliExecutionIdTest extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
index c9f72eeb9..ce33418a5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java
index 97c1165d2..b625d573f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng5774ConfigurationProcessorsTest extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java
index 7180196d5..f6ff52101 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng5783PluginDependencyFiltering extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java
index 264349401..17a1769b8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng5805PkgTypeMojoConfiguration2 extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java
index f95e44720..b2eaf9789 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng5840ParentVersionRanges extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java
index 444f872db..f2ce6f798 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng5840RelativePathReactorMatching extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java
index 46d1cd642..6cae626e7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java
@@ -25,8 +25,8 @@ import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java
index 8f0f99848..e42a29740 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java
index 4b30fcb11..692d0da7f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java
index d77639c47..5634fe401 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java
index f8d4ed7bd..aa5ae269b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java
index 4fe4d5a38..fdfc62c23 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng5958LifecyclePhaseBinaryCompat extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java
index 08334206c..0d95c3a6e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java
@@ -24,9 +24,9 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java
index 56e69d25e..110af39ab 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.LinkedList;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java
index e930edfff..37b069b42 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java
index 07d788685..23b16eab9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java
index 72bd50eeb..2d43723bf 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java
index c1d7ce867..9d038fd20 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.io.IOException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java
index 0b804e357..d55151850 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng6127PluginExecutionConfigurationInterferenceTest extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java
index 474129f09..d887e7ba5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java
@@ -25,8 +25,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java
index c338b6d00..10068bd64 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java
index a25cc6c85..8ebd7d99b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java
index 075ba649e..c07dc0ca8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java
index 2a43a3b4b..6c4c1d5ee 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java
index 39dcffa9e..443bcda8c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java
index 02f3f882c..41d127f5d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java
@@ -24,8 +24,8 @@ import java.util.Properties;
import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
import com.google.common.io.Files;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java
index 94f037578..c6e950d45 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java
index b686a285f..c065e8f68 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java
@@ -24,9 +24,9 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java
index bbbe2a0cc..65f833c0a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java
index 4c2eb1b01..827fa4c93 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.Properties;
import org.apache.maven.shared.utils.Os;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java
index cd56d7b7a..ce5768fe9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java
@@ -22,8 +22,8 @@ import java.io.File;
import java.util.LinkedList;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java
index 0b8f883ec..86f2d5deb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng6506PackageAnnotationTest extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java
index e7b6b6ee7..0406fea52 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.io.IOException;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java
index 19dc466f3..0fbca2cb0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java
index 62b8fed14..c66c06d4a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java
index 111f4a011..0f1a78e50 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java
index 78776e7e9..86fd03233 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java
index 4d0f4e804..17f472506 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java
@@ -28,8 +28,8 @@ import java.util.Properties;
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.junit.jupiter.api.Test;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java
index 0369f6494..f59d702e6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java
@@ -21,8 +21,8 @@ package org.apache.maven.it;
import java.io.File;
import java.net.URI;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java
index e26d9da55..0d506f25c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
/**
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java
index 2fd8da0e5..9ce50c7a7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng6981ProjectListShouldIncludeChildrenTest extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java
index 312366b2c..99f7c078c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java
@@ -22,9 +22,9 @@ import java.io.File;
import java.io.IOException;
import java.util.Properties;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng7038RootdirTest extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java
index 6f64a2215..73796ae01 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.io.IOException;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng7045DropUselessAndOutdatedCdiApiTest extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java
index 974d33e94..da4d1acc0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java
@@ -24,9 +24,9 @@ import java.io.IOException;
import java.io.Reader;
import java.util.Properties;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng7110ExtensionClassloader extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java
index 077a77511..65adfb665 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java
@@ -21,9 +21,9 @@ package org.apache.maven.it;
import java.io.File;
import java.io.IOException;
-import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.ResourceExtractor;
import org.junit.jupiter.api.Test;
public class MavenITmng7112ProjectsWithNonRecursiveTest extends AbstractMavenIntegrationTestCase {
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java
index 449c30a68..d967d2c60 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java
@@ -20,9 +20,9 @@ package org.apache.maven.it;
import java.io.File;
... 1704 lines suppressed ...