From 13b14eb4a3eef0088547ae20d8ffc68b5e0cfea9 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Thu, 22 Sep 2022 23:15:41 +0200 Subject: [PATCH] [MNG-7549] Upgrade Core ITs to Maven Verifier 2.0.0-M1 Co-authored-by: Slawomir Jaranowski This closes #202 --- .../apache/maven/it/IntegrationTestSuite.java | 3 +++ .../maven/it/MavenIT0008SimplePluginTest.java | 3 ++- .../it/MavenIT0009GoalConfigurationTest.java | 3 ++- ...IT0010DependencyClosureResolutionTest.java | 3 ++- ...aultVersionByDependencyManagementTest.java | 3 ++- .../it/MavenIT0012PomInterpolationTest.java | 3 ++- .../MavenIT0018DependencyManagementTest.java | 3 ++- ...IT0019PluginVersionMgmtBySuperPomTest.java | 3 ++- .../maven/it/MavenIT0021PomProfileTest.java | 3 ++- .../it/MavenIT0023SettingsProfileTest.java | 3 ++- ...MavenIT0024MultipleGoalExecutionsTest.java | 3 ++- ...0025MultipleExecutionLevelConfigsTest.java | 3 ++- ...venIT0030DepPomDepMgmtInheritanceTest.java | 3 ++- .../it/MavenIT0032MavenPrerequisiteTest.java | 3 ++- ...avenIT0037AlternatePomFileSameDirTest.java | 3 ++- ...T0038AlternatePomFileDifferentDirTest.java | 3 ++- ...T0040PackagingFromPluginExtensionTest.java | 3 ++- ...41ArtifactTypeFromPluginExtensionTest.java | 3 ++- .../it/MavenIT0051ReleaseProfileTest.java | 3 ++- .../it/MavenIT0052ReleaseProfileTest.java | 3 ++- ...MavenIT0056MultipleGoalExecutionsTest.java | 3 ++- .../MavenIT0063SystemScopeDependencyTest.java | 3 ++- .../MavenIT0064MojoConfigViaSettersTest.java | 3 ++- ...071PluginConfigWithDottedPropertyTest.java | 3 ++- ...72InterpolationWithDottedPropertyTest.java | 3 ++- .../MavenIT0085TransitiveSystemScopeTest.java | 3 ++- .../maven/it/MavenIT0086PluginRealmTest.java | 3 ++- ...87PluginRealmWithProjectLevelDepsTest.java | 3 ++- .../MavenIT0090EnvVarInterpolationTest.java | 3 ++- .../it/MavenIT0108SnapshotUpdateTest.java | 26 ++++++++++--------- ...rAuthzAvailableToWagonMgrInPluginTest.java | 3 ++- .../it/MavenIT0130CleanLifecycleTest.java | 3 ++- .../it/MavenIT0131SiteLifecycleTest.java | 3 ++- .../maven/it/MavenIT0132PomLifecycleTest.java | 3 ++- .../maven/it/MavenIT0133JarLifecycleTest.java | 3 ++- .../maven/it/MavenIT0134WarLifecycleTest.java | 3 ++- .../maven/it/MavenIT0135EjbLifecycleTest.java | 3 ++- .../maven/it/MavenIT0136RarLifecycleTest.java | 3 ++- .../maven/it/MavenIT0137EarLifecycleTest.java | 3 ++- .../it/MavenIT0138PluginLifecycleTest.java | 3 ++- ...139InterpolationWithProjectPrefixTest.java | 3 ++- ...nIT0140InterpolationWithPomPrefixTest.java | 3 ++- ...MavenIT0142DirectDependencyScopesTest.java | 3 ++- ...nIT0143TransitiveDependencyScopesTest.java | 3 ++- ...avenIT0144LifecycleExecutionOrderTest.java | 3 ++- .../MavenIT0146InstallerSnapshotNaming.java | 3 ++- .../it/MavenIT0199CyclicImportScopeTest.java | 5 ++-- .../apache/maven/it/MavenITBootstrapTest.java | 3 ++- ...enITmng0095ReactorFailureBehaviorTest.java | 4 ++- .../MavenITmng0187CollectedProjectsTest.java | 3 ++- ...enITmng0249ResolveDepsFromReactorTest.java | 3 ++- ...ReactorExecWhenProjectIndependentTest.java | 3 ++- ...mng0294MergeGlobalAndUserSettingsTest.java | 3 ++- ...enITmng0377PluginLookupFromPrefixTest.java | 3 ++- ...nITmng0449PluginVersionResolutionTest.java | 3 ++- ...g0461TolerateMissingDependencyPomTest.java | 3 ++- .../it/MavenITmng0469ReportConfigTest.java | 3 ++- .../it/MavenITmng0471CustomLifecycleTest.java | 3 ++- ...MavenITmng0479OverrideCentralRepoTest.java | 4 ++- ...0496IgnoreUnknownPluginParametersTest.java | 3 ++- .../it/MavenITmng0505VersionRangeTest.java | 3 ++- .../MavenITmng0507ArtifactRelocationTest.java | 3 ++- ...Tmng0522InheritedPluginMgmtConfigTest.java | 3 ++- ...nITmng0553SettingsAuthzEncryptionTest.java | 3 ++- ...venITmng0557UserSettingsCliOptionTest.java | 3 ++- ...enITmng0612NewestConflictResolverTest.java | 3 ++- .../it/MavenITmng0666IgnoreLegacyPomTest.java | 3 ++- ...avenITmng0674PluginParameterAliasTest.java | 3 ++- .../it/MavenITmng0680ParentBasedirTest.java | 3 ++- ...nITmng0761MissingSnapshotDistRepoTest.java | 3 ++- .../it/MavenITmng0768OfflineModeTest.java | 4 ++- ...73SettingsProfileReactorPollutionTest.java | 3 ++- ...ITmng0781PluginConfigVsExecConfigTest.java | 3 ++- ...MavenITmng0786ProfileAwareReactorTest.java | 3 ++- ...Tmng0814ExplicitProfileActivationTest.java | 3 ++- ...avenITmng0818WarDepsNotTransitiveTest.java | 3 ++- .../MavenITmng0820ConflictResolutionTest.java | 3 ++- .../MavenITmng0823MojoContextPassingTest.java | 3 ++- ...Tmng0828PluginConfigValuesInDebugTest.java | 3 ++- ...enITmng0836PluginParentResolutionTest.java | 4 ++- ...48SystemPropOverridesDefaultValueTest.java | 3 ++- ...avenITmng0866EvaluateDefaultValueTest.java | 3 ++- ...ng0870ReactorAwarePluginDiscoveryTest.java | 3 ++- .../MavenITmng0947OptionalDependencyTest.java | 3 ++- ...InjectionViaProjectLevelPluginDepTest.java | 3 ++- ...mng0985NonExecutedPluginMgmtGoalsTest.java | 3 ++- ...mng1021EqualAttachmentBuildNumberTest.java | 3 ++- .../MavenITmng1052PluginMgmtConfigTest.java | 3 ++- ...enITmng1073AggregatorForksReactorTest.java | 3 ++- ...nITmng1088ReactorPluginResolutionTest.java | 3 ++- ...ITmng1142VersionRangeIntersectionTest.java | 3 ++- ...avenITmng1144MultipleDefaultGoalsTest.java | 3 ++- ...nITmng1233WarDepWithProvidedScopeTest.java | 3 ++- .../MavenITmng1323AntrunDependenciesTest.java | 3 ++- .../it/MavenITmng1349ChecksumFormatsTest.java | 3 ++- .../MavenITmng1412DependenciesOrderTest.java | 3 ++- ...enITmng1415QuotedSystemPropertiesTest.java | 5 ++-- ...mng1491ReactorArtifactIdCollisionTest.java | 4 ++- ...Tmng1493NonStandardModulePomNamesTest.java | 3 ++- .../it/MavenITmng1701DuplicatePluginTest.java | 4 ++- ...ITmng1703PluginMgmtDepInheritanceTest.java | 3 ++- ...cedMetadataUpdateDuringDeploymentTest.java | 3 ++- ...ValidationErrorIncludesLineNumberTest.java | 3 ++- ...nITmng1895ScopeConflictResolutionTest.java | 3 ++- ...1957JdkActivationWithVersionRangeTest.java | 3 ++- ...mng1992SystemPropOverridesPomPropTest.java | 3 ++- ...95InterpolateBooleanModelElementsTest.java | 3 ++- ...g2006ChildPathAwareUrlInheritanceTest.java | 3 ++- ...estJarDependenciesBrokenInReactorTest.java | 3 ++- ...lateWithSettingsProfilePropertiesTest.java | 3 ++- ...mng2054PluginExecutionInheritanceTest.java | 3 ++- ...enITmng2068ReactorRelativeParentsTest.java | 3 ++- ...ersionRangeSatisfiedFromWrongRepoTest.java | 3 ++- ...mng2103PluginExecutionInheritanceTest.java | 3 ++- ...enITmng2123VersionRangeDependencyTest.java | 3 ++- ...4PomInterpolationWithParentValuesTest.java | 3 ++- ...g2130ParentLookupFromReactorCacheTest.java | 3 ++- ...avenITmng2135PluginBuildInReactorTest.java | 3 ++- ...enITmng2136ActiveByDefaultProfileTest.java | 3 ++- ...ReactorAwareDepResolutionWhenForkTest.java | 3 ++- ...4PluginDepsManagedByParentProfileTest.java | 3 ++- .../MavenITmng2196ParentResolutionTest.java | 4 ++- .../MavenITmng2199ParentVersionRangeTest.java | 4 ++- ...Tmng2201PluginConfigInterpolationTest.java | 3 ++- ...2OutputDirectoryReactorResolutionTest.java | 3 ++- .../MavenITmng2228ComponentInjectionTest.java | 3 ++- ...mng2234ActiveProfilesFromSettingsTest.java | 3 ++- .../it/MavenITmng2254PomEncodingTest.java | 3 ++- ...ofileActivationBySettingsPropertyTest.java | 3 ++- ...277AggregatorAndResolutionPluginsTest.java | 3 ++- ...venITmng2293CustomPluginParamImplTest.java | 3 ++- .../it/MavenITmng2305MultipleProxiesTest.java | 3 ++- ...venITmng2309ProfileInjectionOrderTest.java | 3 ++- ...venITmng2318LocalParentResolutionTest.java | 3 ++- ...nITmng2339BadProjectInterpolationTest.java | 3 ++- ...MavenITmng2362DeployedPomEncodingTest.java | 3 ++- ...Tmng2363BasedirAwareFileActivatorTest.java | 3 ++- .../it/MavenITmng2387InactiveProxyTest.java | 3 ++- .../MavenITmng2432PluginPrefixOrderTest.java | 3 ++- ...pedDependencyVersionInterpolationTest.java | 3 ++- .../it/MavenITmng2562Timestamp322Test.java | 3 ++- .../it/MavenITmng2576MakeLikeReactorTest.java | 3 ++- ...ITmng2577SettingsXmlInterpolationTest.java | 3 ++- ...mng2591MergeInheritedPluginConfigTest.java | 3 ++- ...enITmng2605BogusProfileActivationTest.java | 3 ++- ...68UsePluginDependenciesForSortingTest.java | 3 ++- .../MavenITmng2690MojoLoadingErrorsTest.java | 4 ++- .../it/MavenITmng2693SitePluginRealmTest.java | 3 ++- ...enITmng2695OfflinePluginSnapshotsTest.java | 3 ++- ...Tmng2720SiblingClasspathArtifactsTest.java | 3 ++- ...738ProfileIdCollidesWithCliOptionTest.java | 3 ++- ...mng2739RequiredRepositoryElementsTest.java | 4 ++- ...ginMetadataResolutionErrorMessageTest.java | 4 ++- ...avenITmng2744checksumVerificationTest.java | 3 ++- ...mng2749ExtensionAvailableToPluginTest.java | 3 ++- ...2771PomExtensionComponentOverrideTest.java | 3 ++- ...MavenITmng2790LastUpdatedMetadataTest.java | 3 ++- .../it/MavenITmng2820PomCommentsTest.java | 3 ++- ...ArtifactHandlerAndCustomLifecycleTest.java | 3 ++- ...43PluginConfigPropertiesInjectionTest.java | 3 ++- ...leActivationByEnvironmentVariableTest.java | 3 ++- ...avenITmng2861RelocationsAndRangesTest.java | 3 ++- .../it/MavenITmng2865MirrorWildcardTest.java | 3 ++- ...71PrePackageSubartifactResolutionTest.java | 3 ++- ...MavenITmng2892HideCorePlexusUtilsTest.java | 3 ++- ...nITmng2921ActiveAttachedArtifactsTest.java | 3 ++- .../MavenITmng2926PluginPrefixOrderTest.java | 3 ++- ...ITmng2972OverridePluginDependencyTest.java | 3 ++- ...nITmng2994SnapshotRangeRepositoryTest.java | 3 ++- ...actorFailureBehaviorMultithreadedTest.java | 4 ++- .../it/MavenITmng3012CoreClassImportTest.java | 3 ++- ...ng3023ReactorDependencyResolutionTest.java | 4 ++- ...nITmng3038TransitiveDepManVersionTest.java | 4 ++- ...ng3043BestEffortReactorResolutionTest.java | 3 ++- .../MavenITmng3052DepRepoAggregationTest.java | 3 ++- ...SnapshotsExcludedFromVersionRangeTest.java | 3 ++- ...Tmng3099SettingsProfilesWithNoPomTest.java | 3 ++- .../MavenITmng3118TestClassPathOrderTest.java | 3 ++- ...mng3122ActiveProfilesNoDuplicatesTest.java | 3 ++- ...rmalizationNotBeforeInterpolationTest.java | 3 ++- ...seCachedMetadataOfBlacklistedRepoTest.java | 3 ++- .../it/MavenITmng3183LoggingToFileTest.java | 3 ++- ...enITmng3203DefaultLifecycleExecIdTest.java | 3 ++- ...mng3208ProfileAwareReactorSortingTest.java | 3 ++- ...venITmng3217InterPluginDependencyTest.java | 3 ++- .../it/MavenITmng3220ImportScopeTest.java | 4 ++- ...3259DepsDroppedInMultiModuleBuildTest.java | 3 ++- ...mng3268MultipleHyphenPCommandLineTest.java | 3 ++- .../MavenITmng3284UsingCachedPluginsTest.java | 3 ++- .../it/MavenITmng3288SystemScopeDirTest.java | 4 ++- ...ng3297DependenciesNotLeakedToMojoTest.java | 3 ++- .../MavenITmng3314OfflineSnapshotsTest.java | 3 ++- ...nITmng3331ModulePathNormalizationTest.java | 3 ++- ...ng3355TranslatedPathInterpolationTest.java | 3 ++- ...Tmng3372DirectInvocationOfPluginsTest.java | 3 ++- ...Tmng3379ParallelArtifactDownloadsTest.java | 3 ++- ...Tmng3380ManagedRelocatedTransdepsTest.java | 3 ++- ...Tmng3394POMPluginVersionDominanceTest.java | 3 ++- ...anagementForOverConstrainedRangesTest.java | 3 ++- .../MavenITmng3401CLIDefaultExecIdTest.java | 3 ++- ...enITmng3415JunkRepositoryMetadataTest.java | 3 ++- ...Tmng3422ActiveComponentCollectionTest.java | 3 ++- ...taUpdatedFromDeploymentRepositoryTest.java | 3 ++- .../it/MavenITmng3461MirrorMatchingTest.java | 3 ++- ...ecksumVerificationOfDependencyPomTest.java | 4 ++- .../it/MavenITmng3475BaseAlignedDirTest.java | 3 ++- ...7DependencyResolutionErrorMessageTest.java | 4 ++- ...mng3482DependencyPomInterpolationTest.java | 3 ++- ...enITmng3485OverrideWagonExtensionTest.java | 3 ++- .../it/MavenITmng3498ForkToOtherMojoTest.java | 3 ++- .../it/MavenITmng3503Xpp3ShadingTest.java | 3 ++- ...ng3506ArtifactHandlersFromPluginsTest.java | 4 ++- .../it/MavenITmng3529QuotedCliArgTest.java | 5 ++-- ...Tmng3535SelfReferentialPropertiesTest.java | 3 ++- ...venITmng3536AppendedAbsolutePathsTest.java | 3 ++- ...MavenITmng3545ProfileDeactivationTest.java | 3 ++- ...decimalOctalPluginParameterConfigTest.java | 3 ++- ...Tmng3581PluginUsesWagonDependencyTest.java | 3 ++- ...ng3586SystemScopePluginDependencyTest.java | 3 ++- ...ITmng3599useHttpProxyForWebDAVMk2Test.java | 7 ++--- ...enITmng3600DeploymentModeDefaultsTest.java | 3 ++- ...ITmng3607ClassLoadersUseValidUrlsTest.java | 3 ++- .../MavenITmng3621UNCInheritedPathsTest.java | 3 ++- ...ITmng3641ProfileActivationWarningTest.java | 3 ++- .../MavenITmng3642DynamicResourcesTest.java | 3 ++- .../it/MavenITmng3645POMSyntaxErrorTest.java | 4 ++- .../it/MavenITmng3652UserAgentHeaderTest.java | 3 ++- ...g3667ResolveDepsWithBadPomVersionTest.java | 3 ++- ...ng3671PluginLevelDepInterpolationTest.java | 3 ++- ...Tmng3679PluginExecIdInterpolationTest.java | 3 ++- ...avenITmng3680InvalidDependencyPOMTest.java | 3 ++- ...avenITmng3684BuildPluginParameterTest.java | 3 ++- ...avenITmng3693PomFileBasedirChangeTest.java | 3 ++- ...nITmng3694ReactorProjectsDynamismTest.java | 3 ++- .../MavenITmng3701ImplicitProfileIdTest.java | 3 ++- ...ExecutionProjectWithRelativePathsTest.java | 3 ++- ...venITmng3710PollutedClonedPluginsTest.java | 3 ++- ...MavenITmng3714ToolchainsCliOptionTest.java | 3 ++- .../MavenITmng3716AggregatorForkingTest.java | 3 ++- ...avenITmng3719PomExecutionOrderingTest.java | 3 ++- ...venITmng3723ConcreteParentProjectTest.java | 3 ++- ...avenITmng3724ExecutionProjectSyncTest.java | 3 ++- ...avenITmng3729MultiForkAggregatorsTest.java | 3 ++- .../it/MavenITmng3732ActiveProfilesTest.java | 3 ++- ...740SelfReferentialReactorProjectsTest.java | 3 ++- ...MavenITmng3746POMPropertyOverrideTest.java | 3 ++- ...enITmng3747PrefixedPathExpressionTest.java | 3 ++- .../it/MavenITmng3748BadSettingsXmlTest.java | 4 ++- ...nITmng3766ToolchainsFromExtensionTest.java | 3 ++- ...ng3769ExclusionRelocatedTransdepsTest.java | 3 ++- ...775ConflictResolutionBacktrackingTest.java | 3 ++- ...ITmng3796ClassImportInconsistencyTest.java | 3 ++- ...mng3805ExtensionClassPathOrderingTest.java | 3 ++- ...7PluginConfigExpressionEvaluationTest.java | 3 ++- ...Tmng3808ReportInheritanceOrderingTest.java | 3 ++- ...avenITmng3810BadProfileActivationTest.java | 3 ++- ...ingPluginConfigurationInheritanceTest.java | 3 ++- ...nITmng3813PluginClassPathOrderingTest.java | 3 ++- .../MavenITmng3814BogusProjectCycleTest.java | 3 ++- .../MavenITmng3821EqualPluginExecIdsTest.java | 3 ++- ...ng3822BasedirAlignedInterpolationTest.java | 3 ++- .../it/MavenITmng3827PluginConfigTest.java | 3 ++- .../MavenITmng3831PomInterpolationTest.java | 3 ++- ...3833PomInterpolationDataFlowChainTest.java | 3 ++- ...nITmng3836PluginConfigInheritanceTest.java | 3 ++- .../it/MavenITmng3838EqualPluginDepsTest.java | 3 ++- ...enITmng3839PomParsingCoalesceTextTest.java | 3 ++- .../it/MavenITmng3843PomInheritanceTest.java | 3 ++- ...venITmng3845LimitedPomInheritanceTest.java | 3 ++- ...ng3846PomInheritanceUrlAdjustmentTest.java | 3 ++- ...PluginConfigWithHeterogeneousListTest.java | 3 ++- ...ITmng3853ProfileInjectedDistReposTest.java | 3 ++- .../MavenITmng3863AutoPluginGroupIdTest.java | 4 ++- ...MavenITmng3864PerExecPluginConfigTest.java | 3 ++- ...nITmng3866PluginConfigInheritanceTest.java | 3 ++- ...72ProfileActivationInRelocatedPomTest.java | 3 ++- ...enITmng3873MultipleExecutionGoalsTest.java | 3 ++- ...MavenITmng3877BasedirAlignedModelTest.java | 3 ++- ...MavenITmng3886ExecutionGoalsOrderTest.java | 3 ++- ...avenITmng3887PluginExecutionOrderTest.java | 3 ++- ...90TransitiveDependencyScopeUpdateTest.java | 3 ++- .../MavenITmng3892ReleaseDeploymentTest.java | 3 ++- ...avenITmng3899ExtensionInheritanceTest.java | 3 ++- ...900ProfilePropertiesInterpolationTest.java | 3 ++- ...ng3904NestedBuildDirInterpolationTest.java | 3 ++- ...3906MergedPluginClassPathOrderingTest.java | 3 ++- ...mng3916PluginExecutionInheritanceTest.java | 3 ++- ...enITmng3924XmlMarkupInterpolationTest.java | 3 ++- ...mng3925MergedPluginExecutionOrderTest.java | 3 ++- ...g3927PluginDefaultExecutionConfigTest.java | 3 ++- ...mng3937MergedPluginExecutionGoalsTest.java | 3 ++- ...venITmng3938MergePluginExecutionsTest.java | 3 ++- ...MavenITmng3940EnvVarInterpolationTest.java | 3 ++- ...ionProjectRestrictedToForkingMojoTest.java | 3 ++- ...mng3943PluginExecutionInheritanceTest.java | 3 ++- ...avenITmng3944BasedirInterpolationTest.java | 3 ++- ...g3947PluginDefaultExecutionConfigTest.java | 3 ++- ...8ParentResolutionFromProfileReposTest.java | 3 ++- .../it/MavenITmng3951AbsolutePathsTest.java | 3 ++- ...nITmng3953AuthenticatedDeploymentTest.java | 3 ++- .../MavenITmng3955EffectiveSettingsTest.java | 3 ++- ...3970DepResolutionFromProfileReposTest.java | 3 ++- .../it/MavenITmng3974MirrorOrderingTest.java | 3 ++- .../it/MavenITmng3979ElementJoinTest.java | 3 ++- ...3PluginResolutionFromProfileReposTest.java | 3 ++- ...avenITmng3991ValidDependencyScopeTest.java | 4 ++- ...venITmng3998PluginExecutionConfigTest.java | 3 ++- ...venITmng4000MultiPluginExecutionsTest.java | 3 ++- ...MavenITmng4005UniqueDependencyKeyTest.java | 4 ++- ...venITmng4007PlatformFileSeparatorTest.java | 3 ++- .../MavenITmng4008MergedFilterOrderTest.java | 3 ++- ...venITmng4009InheritProfileEffectsTest.java | 3 ++- ...4016PrefixedPropertyInterpolationTest.java | 3 ++- ...4022IdempotentPluginConfigMergingTest.java | 3 ++- ...4023ParentProfileOneTimeInjectionTest.java | 3 ++- ...ITmng4026ReactorDependenciesOrderTest.java | 3 ++- ...ITmng4034ManagedProfileDependencyTest.java | 3 ++- ...6ParentResolutionFromSettingsRepoTest.java | 3 ++- ...enITmng4040ProfileInjectedModulesTest.java | 3 ++- ...4048VersionRangeReactorResolutionTest.java | 3 ++- ...nITmng4052ReactorAwareImportScopeTest.java | 3 ++- ...enITmng4053PluginConfigAttributesTest.java | 3 ++- ...fierBasedDepResolutionFromReactorTest.java | 3 ++- ...MavenITmng4068AuthenticatedMirrorTest.java | 3 ++- .../MavenITmng4070WhitespaceTrimmingTest.java | 3 ++- ...avenITmng4072InactiveProfileReposTest.java | 3 ++- ...venITmng4087PercentEncodedFileUrlTest.java | 3 ++- ...MavenITmng4091BadPluginDescriptorTest.java | 4 ++- ...102InheritedPropertyInterpolationTest.java | 3 ++- ...6InterpolationUsesDominantProfileTest.java | 3 ++- ...polationUsesDominantProfileSourceTest.java | 3 ++- ...avenITmng4112MavenVersionPropertyTest.java | 3 ++- .../it/MavenITmng4116UndecodedUrlsTest.java | 3 ++- ...mng4129PluginExecutionInheritanceTest.java | 3 ++- .../it/MavenITmng4150VersionRangeTest.java | 3 ++- .../MavenITmng4162ReportingMigrationTest.java | 3 ++- .../MavenITmng4166HideCoreCommonsCliTest.java | 3 ++- .../MavenITmng4172EmptyDependencySetTest.java | 3 ++- ...nITmng4180PerDependencyExclusionsTest.java | 3 ++- ...venITmng4189UniqueVersionSnapshotTest.java | 3 ++- .../MavenITmng4190MirrorRepoMergingTest.java | 3 ++- .../it/MavenITmng4193UniqueRepoIdTest.java | 4 ++- ...avenITmng4196ExclusionOnPluginDepTest.java | 3 ++- ...ITmng4199CompileMeetsRuntimeScopeTest.java | 3 ++- ...4203TransitiveDependencyExclusionTest.java | 3 ++- .../it/MavenITmng4207PluginWithLog4JTest.java | 3 ++- ...olationPrefersCliOverProjectPropsTest.java | 3 ++- ...Tmng4214MirroredParentSearchReposTest.java | 3 ++- ...avenITmng4231SnapshotUpdatePolicyTest.java | 3 ++- ...olutionForManuallyCreatedArtifactTest.java | 3 ++- ...ng4235HttpAuthDeploymentChecksumsTest.java | 3 ++- ...4238ArtifactHandlerExtensionUsageTest.java | 4 ++- ...g4262MakeLikeReactorDottedPath370Test.java | 3 ++- ...Tmng4262MakeLikeReactorDottedPathTest.java | 3 ++- ...269BadReactorResolutionFromOutDirTest.java | 3 ++- ...270ArtifactHandlersFromPluginDepsTest.java | 4 ++- ...estrictedCoreRealmAccessForPluginTest.java | 3 ++- ...avenITmng4274PluginRealmArtifactsTest.java | 3 ++- .../MavenITmng4275RelocationWarningTest.java | 3 ++- ...mng4276WrongTransitivePlexusUtilsTest.java | 3 ++- ...MavenITmng4281PreferLocalSnapshotTest.java | 3 ++- .../MavenITmng4283ParentPomPackagingTest.java | 4 ++- ...enITmng4291MojoRequiresOnlineModeTest.java | 4 ++- ...enITmng4292EnumTypeMojoParametersTest.java | 3 ++- ...93RequiresCompilePlusRuntimeScopeTest.java | 3 ++- ...mng4304ProjectDependencyArtifactsTest.java | 3 ++- .../MavenITmng4305LocalRepoBasedirTest.java | 3 ++- ...rictChecksumValidationForMetadataTest.java | 4 ++- ...luginParameterExpressionInjectionTest.java | 3 ++- ...g4314DirectInvocationOfAggregatorTest.java | 3 ++- ...inVersionResolutionFromMultiReposTest.java | 3 ++- ...avenITmng4318ProjectExecutionRootTest.java | 3 ++- ...9PluginExecutionGoalInterpolationTest.java | 3 ++- ...Tmng4320AggregatorAndDependenciesTest.java | 3 ++- ...nITmng4321CliUsesPluginMgmtConfigTest.java | 3 ++- ...ocalSnapshotSuppressesRemoteCheckTest.java | 3 ++- ...udeForkingMojoFromForkedLifecycleTest.java | 3 ++- ...imitiveMojoParameterConfigurationTest.java | 3 ++- ...avenITmng4331DependencyCollectionTest.java | 3 ++- ...ng4332DefaultPluginExecutionOrderTest.java | 3 ++- ...MavenITmng4335SettingsOfflineModeTest.java | 4 ++- .../it/MavenITmng4338OptionalMojosTest.java | 3 ++- ...avenITmng4341PluginExecutionOrderTest.java | 3 ++- ...pendentMojoParameterDefaultValuesTest.java | 3 ++- ...mng4343MissingReleaseUpdatePolicyTest.java | 4 ++- ...ng4344ManagedPluginExecutionOrderTest.java | 3 ++- ...ng4345DefaultPluginExecutionOrderTest.java | 3 ++- ...47ImportScopeWithSettingsProfilesTest.java | 3 ++- ...4348NoUnnecessaryRepositoryAccessTest.java | 3 ++- ...49RelocatedArtifactWithInvalidPomTest.java | 3 ++- ...350LifecycleMappingExecutionOrderTest.java | 3 ++- ...inDependencyResolutionFromPomRepoTest.java | 3 ++- ...tensionAutomaticVersionResolutionTest.java | 3 ++- ...dlessRelookupFromActiveCollectionTest.java | 3 ++- ...ifecycleMappingDiscoveryInReactorTest.java | 3 ++- ...lyReachableParentOutsideOfReactorTest.java | 3 ++- .../it/MavenITmng4360WebDavSupportTest.java | 3 ++- ...4361ForceDependencySnapshotUpdateTest.java | 3 ++- ...namicAdditionOfDependencyArtifactTest.java | 3 ++- ...Tmng4365XmlMarkupInAttributeValueTest.java | 3 ++- ...mng4367LayoutAwareMirrorSelectionTest.java | 3 ++- ...68TimestampAwareArtifactInstallerTest.java | 3 ++- ...eSystemPathInterpolatedWithEnvVarTest.java | 3 ++- ...ng4381ExtensionSingletonComponentTest.java | 3 ++- ...enITmng4383ValidDependencyVersionTest.java | 4 ++- ...ycleMappingFromExtensionInReactorTest.java | 4 ++- .../it/MavenITmng4386DebugLoggingTest.java | 3 ++- .../it/MavenITmng4387QuietLoggingTest.java | 3 ++- ...g4393ParseExternalParenPomLenientTest.java | 3 ++- ...enITmng4396AntBased20xMojoSupportTest.java | 3 ++- .../it/MavenITmng4400RepositoryOrderTest.java | 3 ++- ...ng4401RepositoryOrderForParentPomTest.java | 3 ++- ...avenITmng4402DuplicateChildModuleTest.java | 4 ++- ...ng4403LenientDependencyPomParsingTest.java | 3 ++- .../it/MavenITmng4404UniqueProfileIdTest.java | 4 ++- .../MavenITmng4405ValidPluginVersionTest.java | 4 ++- ...nITmng4408NonExistentSettingsFileTest.java | 4 ++- .../maven/it/MavenITmng4410UsageHelpTest.java | 3 ++- .../it/MavenITmng4411VersionInfoTest.java | 3 ++- ...MavenITmng4412OfflineModeInPluginTest.java | 4 ++- ...Tmng4413MirroringOfDependencyRepoTest.java | 3 ++- ...avenITmng4415InheritedPluginOrderTest.java | 3 ++- ...6PluginOrderAfterProfileInjectionTest.java | 3 ++- ...ecatedPomInterpolationExpressionsTest.java | 3 ++- ...PluginExecutionPhaseInterpolationTest.java | 3 ++- ...DataFromPluginParameterExpressionTest.java | 3 ++- .../MavenITmng4428FollowHttpRedirectTest.java | 3 ++- ...29CompRequirementOnNonDefaultImplTest.java | 3 ++- ...g4430DistributionManagementStatusTest.java | 4 ++- ...Tmng4433ForceParentSnapshotUpdateTest.java | 3 ++- ...ITmng4436SingletonComponentLookupTest.java | 3 ++- ...0StubModelForMissingDependencyPomTest.java | 3 ++- ...esolutionOfSnapshotWithClassifierTest.java | 3 ++- ...PluginVersionFromLifecycleMappingTest.java | 3 ++- ...4459InMemorySettingsKeptEncryptedTest.java | 3 ++- ...venITmng4461ArtifactUploadMonitorTest.java | 3 ++- ...pendencyManagementImportVersionRanges.java | 4 ++- ...4PlatformIndependentFileSeparatorTest.java | 3 ++- ...ginPrefixFromLocalCacheOfDownRepoTest.java | 3 ++- ...thenticatedDeploymentToCustomRepoTest.java | 3 ++- ...470AuthenticatedDeploymentToProxyTest.java | 3 ++- ...ng4474PerLookupWagonInstantiationTest.java | 3 ++- ...ectLevelPluginDepUsedForCliConfigTest.java | 3 ++- ...Tmng4482ForcePluginSnapshotUpdateTest.java | 3 ++- ...88ValidateExternalParenPomLenientTest.java | 3 ++- ...ITmng4489MirroringOfExtensionRepoTest.java | 3 ++- ...avenITmng4498IgnoreBrokenMetadataTest.java | 3 ++- ...500NoUpdateOfTimestampedSnapshotsTest.java | 3 ++- ...ailUponMissingDependencyParentPomTest.java | 4 ++- ...mng4526MavenProjectArtifactsScopeTest.java | 3 ++- ...cludeWagonsFromMavenCoreArtifactsTest.java | 3 ++- ...g4536RequiresNoProjectForkingMojoTest.java | 3 ++- ...tiveComponentCollectionThreadSafeTest.java | 3 ++- ...oreArtifactFilterConsidersGroupIdTest.java | 3 ++- ...Tmng4554PluginPrefixMappingUpdateTest.java | 3 ++- ...g4555MetaversionResolutionOfflineTest.java | 4 ++- ...venITmng4561MirroringOfPluginRepoTest.java | 3 ++- ...65MultiConditionProfileActivationTest.java | 3 ++- ...odelVersionSurroundedByWhitespaceTest.java | 3 ++- ...PluginDepUsedForCliInvocInReactorTest.java | 3 ++- ...solutionFromVersionlessPluginMgmtTest.java | 3 ++- ...90ImportedPomUsesSystemPropertiesTest.java | 3 ++- ...0DependencyOptionalFlagManagementTest.java | 3 ++- ...15ValidateRequiredPluginParameterTest.java | 4 ++- ...ng4618AggregatorBuiltAfterModulesTest.java | 3 ++- ...ingsXmlInterpolationWithXmlMarkupTest.java | 3 ++- ...lidationErrorUponMissingSystemDepTest.java | 3 ++- ...33DualCompilerExecutionsWeaveModeTest.java | 3 ++- ...ictPomParsingRejectsMisplacedTextTest.java | 4 ++- ...654ArtifactHandlerForMainArtifactTest.java | 3 ++- ...avenITmng4660OutdatedPackagedArtifact.java | 4 ++- .../it/MavenITmng4660ResumeFromTest.java | 4 ++- .../it/MavenITmng4666CoreRealmImportTest.java | 3 ++- ...77DisabledPluginConfigInheritanceTest.java | 3 ++- ...enITmng4679SnapshotUpdateInPluginTest.java | 3 ++- ...ng4684DistMgmtOverriddenByProfileTest.java | 3 ++- ...0InterdependentConflictResolutionTest.java | 3 ++- ...96MavenProjectDependencyArtifactsTest.java | 3 ++- ...ependencyManagementExclusionMergeTest.java | 3 ++- ...ITmng4721OptionalPluginDependencyTest.java | 3 ++- ...rrorProxyAuthUsedByProjectBuilderTest.java | 3 ++- ...MavenITmng4745PluginVersionUpdateTest.java | 3 ++- ...venITmng4747JavaAgentUsedByPluginTest.java | 3 ++- ...edMavenProjectDependencyArtifactsTest.java | 3 ++- ...etchRemoteMetadataForVersionRangeTest.java | 3 ++- ...ng4761PluginLevelDependencyScopesTest.java | 3 ++- ...enITmng4765LocalPomProjectBuilderTest.java | 3 ++- ...768NearestMatchConflictResolutionTest.java | 3 ++- ...ResolutionDoesntTouchDisabledRepoTest.java | 4 ++- ...ResolutionDoesntTouchDisabledRepoTest.java | 4 ++- ...kedReactorPluginVersionResolutionTest.java | 3 ++- ...DepsWithVersionRangeFromLocalRepoTest.java | 3 ++- ...g4781DeploymentToNexusStagingRepoTest.java | 3 ++- ...ransitiveResolutionInForkedThreadTest.java | 3 ++- ...enITmng4786AntBased21xMojoSupportTest.java | 3 ++- ...4788InstallationToCustomLocalRepoTest.java | 3 ++- ...4789ScopeInheritanceMeetsConflictTest.java | 3 ++- ...tBuilderResolvesRemotePomArtifactTest.java | 3 ++- ...InReactorProjectForkedByLifecycleTest.java | 3 ++- ...mng4800NearestWinsVsScopeWideningTest.java | 3 ++- ...ng4811CustomComponentConfiguratorTest.java | 3 ++- ...lutionOfDependenciesDuringReactorTest.java | 3 ++- ...enITmng4829ChecksumFailureWarningTest.java | 3 ++- ...entProjectResolvedFromRemoteReposTest.java | 3 ++- .../MavenITmng4840MavenPrerequisiteTest.java | 3 ++- ...42ParentResolutionOfDependencyPomTest.java | 3 ++- ...rResolutionAttachedWithExclusionsTest.java | 3 ++- ...Tmng4874UpdateLatestPluginVersionTest.java | 3 ++- ...venITmng4877DeployUsingPrivateKeyTest.java | 3 ++- ...lUponOverconstrainedVersionRangesTest.java | 3 ++- ...0MakeLikeReactorConsidersVersionsTest.java | 3 ++- ...ITmng4891RobustSnapshotResolutionTest.java | 3 ++- ...PluginDepWithNonRelocatedMavenApiTest.java | 3 ++- ...erPropertyVsDependencyPomPropertyTest.java | 3 ++- ...LifecycleMappingWithSameGoalTwiceTest.java | 3 ++- ...ontainerLookupRealmDuringMojoExecTest.java | 3 ++- .../maven/it/MavenITmng4936EventSpyTest.java | 3 ++- ...Tmng4952MetadataReleaseInfoUpdateTest.java | 3 ++- ...55LocalVsRemoteSnapshotResolutionTest.java | 3 ++- ...venITmng4960MakeLikeReactorResumeTest.java | 3 ++- ...mng4963ParentResolutionFromMirrorTest.java | 3 ++- ...nITmng4966AbnormalUrlPreservationTest.java | 3 ++- ...ExtensionVisibleToPluginInReactorTest.java | 3 ++- ...ofileInjectedPluginExecutionOrderTest.java | 3 ++- ...87TimestampBasedSnapshotSelectionTest.java | 3 ++- .../it/MavenITmng4991NonProxyHostsTest.java | 3 ++- ...4992MapStylePropertiesParamConfigTest.java | 3 ++- ...g5000ChildPathAwareUrlInheritanceTest.java | 3 ++- ...onRangeDependencyParentResolutionTest.java | 3 ++- .../MavenITmng5009AggregationCycleTest.java | 3 ++- ...gureCollectionArrayFromSystemPropTest.java | 3 ++- ...012CollectionVsArrayParamCoercionTest.java | 3 ++- ...ConfigureParamBeanFromScalarValueTest.java | 3 ++- ...sedCompLookupFromChildPluginRealmTest.java | 3 ++- ...nITmng5064SuppressSnapshotUpdatesTest.java | 3 ++- ...AtDependencyWithImpliedClassifierTest.java | 3 ++- ...gatorDepResolutionModuleExtensionTest.java | 3 ++- ...137ReactorResolutionInForkedBuildTest.java | 3 ++- .../maven/it/MavenITmng5175WagonHttpTest.java | 3 ++- ...MavenITmng5206PlexusLifecycleHonoured.java | 3 ++- .../MavenITmng5208EventSpyParallelTest.java | 3 ++- .../it/MavenITmng5214DontMapWsdlToJar.java | 3 ++- .../it/MavenITmng5222MojoDeprecatedTest.java | 3 ++- .../it/MavenITmng5224InjectedSettings.java | 3 ++- ...nITmng5230MakeReactorWithExcludesTest.java | 3 ++- ...SettingsProfilesRepositoriesOrderTest.java | 3 ++- .../MavenITmng5338FileOptionToDirectory.java | 3 ++- .../maven/it/MavenITmng5382Jsr330Plugin.java | 3 ++- ...venITmng5387ArtifactReplacementPlugin.java | 3 ++- ...89LifecycleParticipantAfterSessionEnd.java | 3 ++- ...418FileProjectPropertiesActivatorTest.java | 3 ++- ...gacyStringSearchModelInterpolatorTest.java | 3 ++- ...enITmng5452MavenBuildTimestampUTCTest.java | 3 ++- .../it/MavenITmng5482AetherNotFoundTest.java | 4 ++- .../it/MavenITmng5503ZipInReactorTest.java | 3 ++- .../MavenITmng5530MojoExecutionScopeTest.java | 3 ++- ...venITmng5557ProperlyRestrictedReactor.java | 4 ++- ...luginRelocationLosesConfigurationTest.java | 3 ++- ...nITmng5572ReactorPluginExtensionsTest.java | 3 ++- .../it/MavenITmng5576CdFriendlyVersions.java | 3 ++- .../it/MavenITmng5578SessionScopeTest.java | 3 ++- ...avenITmng5581LifecycleMappingDelegate.java | 11 +++++--- .../it/MavenITmng5591WorkspaceReader.java | 3 ++- ...ITmng5608ProfileActivationWarningTest.java | 3 ++- ...ITmng5639ImportScopePomResolutionTest.java | 3 ++- ...40LifecycleParticipantAfterSessionEnd.java | 4 ++- ...663NestedImportScopePomResolutionTest.java | 3 ++- .../maven/it/MavenITmng5669ReadPomsOnce.java | 3 ++- .../it/MavenITmng5716ToolchainsTypeTest.java | 3 ++- ...Tmng5742BuildExtensionClassloaderTest.java | 3 ++- ...53CustomMojoExecutionConfiguratorTest.java | 3 ++- .../it/MavenITmng5760ResumeFeatureTest.java | 4 ++- .../it/MavenITmng5768CliExecutionIdTest.java | 3 ++- .../it/MavenITmng5771CoreExtensionsTest.java | 3 ++- ...nITmng5774ConfigurationProcessorsTest.java | 4 ++- ...venITmng5783PluginDependencyFiltering.java | 3 ++- ...venITmng5805PkgTypeMojoConfiguration2.java | 3 ++- .../it/MavenITmng5840ParentVersionRanges.java | 3 ++- ...nITmng5840RelativePathReactorMatching.java | 3 ++- ...ITmng5868NoDuplicateAttachedArtifacts.java | 3 ++- .../maven/it/MavenITmng5889FindBasedir.java | 3 ++- ...ng5895CIFriendlyUsageWithPropertyTest.java | 3 ++- ...ltimoduleWithEARFailsToResolveWARTest.java | 3 ++- ...ostInTranstiveManagedDependenciesTest.java | 3 ++- ...enITmng5958LifecyclePhaseBinaryCompat.java | 4 ++- ...ng5965ParallelBuildMultipliesWorkTest.java | 4 ++- .../MavenITmng6057CheckReactorOrderTest.java | 3 ++- .../it/MavenITmng6065FailOnSeverityTest.java | 4 ++- ...avenITmng6071GetResourceWithCustomPom.java | 3 ++- .../it/MavenITmng6084Jsr250PluginTest.java | 3 ++- .../it/MavenITmng6090CIFriendlyTest.java | 3 ++- .../it/MavenITmng6118SubmoduleInvocation.java | 3 ++- ...xecutionConfigurationInterferenceTest.java | 3 ++- ...nITmng6173GetAllProjectsInReactorTest.java | 3 ++- ...6173GetProjectsAndDependencyGraphTest.java | 3 ++- ...ITmng6189SiteReportPluginsWarningTest.java | 3 ++- ...mng6210CoreExtensionsCustomScopesTest.java | 3 ++- ...Tmng6240PluginExtensionAetherProvider.java | 3 ++- .../it/MavenITmng6255FixConcatLines.java | 3 ++- ...g6256SpecialCharsAlternatePOMLocation.java | 3 ++- ...enITmng6326CoreExtensionsNotFoundTest.java | 4 ++- .../maven/it/MavenITmng6330RelativePath.java | 4 ++- .../it/MavenITmng6386BaseUriPropertyTest.java | 3 ++- .../it/MavenITmng6391PrintVersionTest.java | 3 ++- .../MavenITmng6506PackageAnnotationTest.java | 3 ++- ...ITmng6511OptionalProjectSelectionTest.java | 4 ++- ...nITmng6558ToolchainsBuildingEventTest.java | 3 ++- .../it/MavenITmng6562WarnDefaultBindings.java | 3 ++- ...AnnotationShouldNotReExecuteGoalsTest.java | 4 ++- .../maven/it/MavenITmng6656BuildConsumer.java | 3 ++- .../maven/it/MavenITmng6720FailFastTest.java | 4 ++- ...Tmng6754TimestampInMultimoduleProject.java | 3 ++- ...9TransitiveDependencyRepositoriesTest.java | 3 ++- ...72NestedImportScopeRepositoryOverride.java | 3 ++- .../maven/it/MavenITmng6957BuildConsumer.java | 3 ++- ...Tmng6972AllowAccessToGraphPackageTest.java | 3 ++- ...1ProjectListShouldIncludeChildrenTest.java | 4 ++- ...g7045DropUselessAndOutdatedCdiApiTest.java | 4 ++- ...Tmng7051OptionalProfileActivationTest.java | 4 ++- .../MavenITmng7110ExtensionClassloader.java | 4 ++- ...ITmng7112ProjectsWithNonRecursiveTest.java | 4 ++- ...ITmng7128BlockExternalHttpReactorTest.java | 4 ++- .../MavenITmng7160ExtensionClassloader.java | 4 ++- ...ITmng7244IgnorePomPrefixInExpressions.java | 4 ++- ...fecycleActivatedInSpecifiedModuleTest.java | 3 ++- ...venITmng7335MissingJarInParallelBuild.java | 4 ++- .../MavenITmng7349RelocationWarningTest.java | 3 ++- .../MavenITmng7353CliGoalInvocationTest.java | 3 ++- .../maven/it/MavenITmng7360BuildConsumer.java | 3 ++- ...enITmng7390SelectModuleOutsideCwdTest.java | 4 ++- ...ng7404IgnorePrefixlessExpressionsTest.java | 4 ++- ...encyOfOptionalProjectsAndProfilesTest.java | 4 ++- ...7464ReadOnlyMojoParametersWarningTest.java | 3 ++- ...g7468UnsupportedPluginsParametersTest.java | 3 ++- .../MavenITmng7470ResolverTransportTest.java | 3 ++- .../it/MavenITmng7474SessionScopeTest.java | 3 ++- .../maven/it/MavenITmng7487DeadlockTest.java | 4 ++- ...04NotWarnUnsupportedReportPluginsTest.java | 4 ++- ...ng7529VersionRangeRepositorySelection.java | 3 ++- .../basic/pom.xml | 4 +-- .../extension/pom.xml | 6 +---- .../it/AbstractMavenIntegrationTestCase.java | 3 +++ ...avenITmngXXXXDescriptionOfProblemTest.java | 4 ++- its/pom.xml | 2 +- 644 files changed, 1389 insertions(+), 665 deletions(-) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index f06ca24aa3..64e25fb340 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -30,6 +30,9 @@ import junit.framework.TestSuite; import org.codehaus.plexus.util.IOUtil; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + /** * The Core IT suite. */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java index 5451769797..0bf765a94a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java index ae9d3bfe7a..3a7f28d35e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java index f6b0eac5a2..43b987579f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java index 65f202fcc7..36f26efb20 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java index b5939e1242..70c6858fee 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java index b24d96cf7c..9b490d6bda 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java index 8ad6dbc7d1..7e4104d65a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java index c105e70895..9551655258 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java index af707ce872..1bfcbd411d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java index 268c75750e..dfd543c1bb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java index cd72970fd4..e7675c29f9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java index c36dd75bd9..a9389d64f4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java index bde8780ed3..5e212c6498 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java index 8c5dbd1ae8..665d4fd53f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java index c7e9f9c66c..20b8248294 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java index c27febe36f..64d132ba42 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java index 1081527ede..85605c6699 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java index 329b154dac..c4172fd089 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java index 2e8d621549..3342ff0158 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java index 85bd8c27ba..970a7b4a67 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java index 83ef57eee4..87553f8426 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java index e0cb9f25d6..95fcaa553b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java index 96686f2a50..10558c5d70 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java index 54f47e4c35..d9982f30e6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java index 1c49b38f36..f0331dc0de 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Collection; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java index da90affa05..59b6e744a4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java index c2896c7ec9..9ae5e1d36c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java index 75c7270656..482a8c5bfb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.HashMap; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java index 791ee77d9c..0444fb3de6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java @@ -26,7 +26,9 @@ import java.util.Calendar; import java.util.Date; import java.util.Locale; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import org.apache.maven.shared.utils.io.FileUtils; /** @@ -81,7 +83,7 @@ public class MavenIT0108SnapshotUpdateTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); - assertArtifactContents( "originalArtifact" ); + verifyArtifactContent( "originalArtifact" ); // set in the past to ensure it is downloaded localRepoFile.setLastModified( System.currentTimeMillis() - TIME_OFFSET ); @@ -90,7 +92,7 @@ public class MavenIT0108SnapshotUpdateTest verifier.executeGoal( "package" ); - assertArtifactContents( "updatedArtifact" ); + verifyArtifactContent( "updatedArtifact" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); @@ -109,7 +111,7 @@ public class MavenIT0108SnapshotUpdateTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); - assertArtifactContents( "originalArtifact" ); + verifyArtifactContent( "originalArtifact" ); FileUtils.fileWrite( artifact.getAbsolutePath(), "updatedArtifact" ); metadata = new File( repository, "org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml" ); @@ -117,7 +119,7 @@ public class MavenIT0108SnapshotUpdateTest verifier.executeGoal( "package" ); - assertArtifactContents( "updatedArtifact" ); + verifyArtifactContent( "updatedArtifact" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); @@ -142,7 +144,7 @@ public class MavenIT0108SnapshotUpdateTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); - assertArtifactContents( "originalArtifact" ); + verifyArtifactContent( "originalArtifact" ); assertFalse( localMetadata.exists() ); FileUtils.fileWrite( localRepoFile.getAbsolutePath(), "localArtifact" ); @@ -155,7 +157,7 @@ public class MavenIT0108SnapshotUpdateTest verifier.executeGoal( "package" ); - assertArtifactContents( "localArtifact" ); + verifyArtifactContent( "localArtifact" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); @@ -171,7 +173,7 @@ public class MavenIT0108SnapshotUpdateTest verifier.executeGoal( "package" ); - assertArtifactContents( "originalArtifact" ); + verifyArtifactContent( "originalArtifact" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); @@ -191,7 +193,7 @@ public class MavenIT0108SnapshotUpdateTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); - assertArtifactContents( "originalArtifact" ); + verifyArtifactContent( "originalArtifact" ); FileUtils.fileWrite( artifact.getAbsolutePath(), "updatedArtifact" ); metadata = new File( repository, "org/apache/maven/maven-core-it-support/1.0-SNAPSHOT/maven-metadata.xml" ); @@ -199,7 +201,7 @@ public class MavenIT0108SnapshotUpdateTest verifier.executeGoal( "package" ); - assertArtifactContents( "updatedArtifact" ); + verifyArtifactContent( "updatedArtifact" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); @@ -210,11 +212,11 @@ public class MavenIT0108SnapshotUpdateTest return new File( verifier.getArtifactMetadataPath( groupId, artifactId, version, "maven-metadata-local.xml" ) ); } - private void assertArtifactContents( String s ) + private void verifyArtifactContent( String s ) throws IOException, VerificationException { verifier.verifyArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.0-SNAPSHOT", "jar" ); - verifier.assertArtifactContents( "org.apache.maven", "maven-core-it-support", "1.0-SNAPSHOT", "jar", s ); + verifier.verifyArtifactContent( "org.apache.maven", "maven-core-it-support", "1.0-SNAPSHOT", "jar", s ); } private static File deleteLocalArtifact( Verifier verifier, File localRepoFile ) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java index 2a27bf379e..0f4d3a46b1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java index 91b1ef8401..3f28a809a7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java index 477f2ba41b..6894a8065f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java index 3dd03e7da9..0bfc5149e8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java index c3926c0cbe..331e365037 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java index 43e7807ee1..b1db60983c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java index 39107bafd1..ebfd5a353c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java index 3bfec08024..d4d5ad950f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java index d6aa6021d4..a8fc8d7cea 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java index 54606e70d1..98f0ae5cc0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java index 3696d6ed16..ee977ba26c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java index 1e03241f26..4117588fc1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java index f3553e0859..5924609649 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java index 7f5c83a6bc..e1f8e9ca1e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java index 4bf735eca1..35c81be00b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.ArrayList; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java index 84c1783c50..cd7c52d176 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java index 0e7d2bd843..2d547ac765 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java @@ -20,7 +20,8 @@ package org.apache.maven.it; */ import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; public class MavenIT0199CyclicImportScopeTest extends AbstractMavenIntegrationTestCase { @@ -47,7 +48,7 @@ public class MavenIT0199CyclicImportScopeTest extends AbstractMavenIntegrationTe verifier.deleteDirectory("target"); verifier.executeGoal("install"); if (expectedArtifact != null) { - verifier.assertFilePresent(expectedArtifact); + verifier.verifyFilePresent(expectedArtifact); } verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java index c3a86d52e2..d49339ee6a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java index eabf14e611..369a966d88 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java index b83a7bf50c..60133a1af8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.ArrayList; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java index 7b3201d3f7..0c89e848c8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java index 0f50070164..96e837d2ba 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java index e6850b4388..3607998c40 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java index e34972615d..38b9d005d4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java index e83c2b1eca..7623edd26c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java index 679864e05b..df6d5fe87d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java index a9f599b2ca..2bf82ed430 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java index 00756ec633..684df17c6b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java index 83116a77e3..72c8968c3a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java index 12ece5c760..66eaea63e0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java index 5b72474392..651244b8a0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Collection; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java index 2ca98c2997..a1c78725fe 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java index d95cde1af9..9d95e49767 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java index ca0fe450e9..87246c926c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Collections; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java index 71029c404d..0c7b8209be 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java index 7d20852013..472b3ac660 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java index fe1b5a3da9..6555d7db35 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java index a9297a3307..74507b8e74 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java index 70766d89db..bd06924d68 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java index e02c1997d5..c56cd987b7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java index 7d7485e4fb..8c92a070e5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java index 3dbf87da3e..e430869e59 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java index 855c9dd1d5..3d91479e3c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java index 45a71e8051..b38b4c83a5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java index d9dda867c9..89a6b85507 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java index f0806c7f22..36671450a6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Collection; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java index 97e8aa1fc4..6e000a8631 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Collection; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java index 12dcd3905c..f850ce6d54 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java index a1eeec61c0..81d9465228 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java @@ -24,7 +24,8 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.io.FileUtils; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java index 3c8f972952..75076f579b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848SystemPropOverridesDefaultValueTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848SystemPropOverridesDefaultValueTest.java index a081e37e38..ecb76a6ed1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848SystemPropOverridesDefaultValueTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848SystemPropOverridesDefaultValueTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java index 37623f5276..85547168c0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java index c464adf574..40890d2696 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-870. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java index 58f65b5a8f..8177845aca 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java index 456da400ff..d81610862b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java index 8dc87cea51..862a5cca96 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java index 66345396b3..f9ab4119d5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java index 1933d13052..1ff0cae5db 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java index 765894794e..b55c78d49c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java index 30a236b34f..463dcde3cb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java index 2fa9ff03c8..e3f9a243f9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java index d59419ce8c..dd9a8d357d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Collections; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java index f1ffa8d58a..9c8d7dfcb8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Collection; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java index 657517df4b..67005ae052 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-1323. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java index 7ef9e3af3b..b321830d43 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-1349. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java index fec4524000..ca7d099234 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java index da771ebd03..1f836fde8b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; @@ -50,7 +51,7 @@ public class MavenITmng1415QuotedSystemPropertiesTest Verifier verifier = newVerifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); - verifier.addCliOption( "-Dtest.property=\"Test Property\"" ); + verifier.addCliOption( "-Dtest.property=Test Property" ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java index e29168dc23..5cc80b2181 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java index 00378cd8b0..acd3819fe4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-1493. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java index fe156007c6..2681b564c1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java index a2d643612a..4ccf0b92d9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java index 5df353adf8..aa4f69faa7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.io.FileUtils; import static org.junit.Assert.assertNotEquals; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java index a3cb46d318..c715b1b54e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java index f9e1c44e5d..5241362a51 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java index 30ad0f970a..a1202e74bd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java index f68056acdc..c1b0e8194c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java index fd5c4f793c..48f1ecd9f7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java index cd8ac192e3..99e773a7b5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java index 114fd0522f..18a7950d52 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.List; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-2045: diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java index 50abb06818..b8dbbfb61f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java index 18870025af..2a76ac1c54 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java index 8b4a4d9bae..ed47063146 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-2068. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java index 79c5a32a80..a5e57475b9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java index 879e7f2e47..4b6e28c02b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java index 6318d88408..220c3f999a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.List; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-2123. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java index d6429f9405..226bdd0814 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java index fc4c46e206..ddf7d39298 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java index 90dd3e8590..85a144af6d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java index 85535a16a4..69e09ef118 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java index 21471d9a3f..a8898dcb34 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java index 1de662fdd3..e77f012e45 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java index b8fdff8fc0..8ab8713aaf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java index eeb16191a5..b19d8105f8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java @@ -18,7 +18,9 @@ package org.apache.maven.it; import java.io.File; import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; public class MavenITmng2199ParentVersionRangeTest extends AbstractMavenIntegrationTestCase diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java index 43afb89041..6d144ffa38 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java index a37117e229..4d5e0eed0f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java index 084a2fb82c..9be8931062 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java index 67bb0bfdf7..ea8d74230a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java index 86ea2cf00b..ad18a4de75 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-2254: diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java index ed099846af..1828474b8d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java index caa3dead61..3d38319786 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-2277. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java index 42c517c1b3..294d88df7f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java index 317b460196..42468395ec 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.io.IOException; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java index 56a51a5fde..3e8ec05c16 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-2309. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java index 34cd0b7236..236a5212da 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java index 3bc33bbcfa..1742ac54c5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java index fc2dfc7c45..580e14682d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.io.FileUtils; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java index 8d9df6d405..3ca151244d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java index 82d884ab8a..5392de48f4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java index 093f2cb606..0980542c88 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-2432 diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java index 12997880fc..afa35bd5a9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java index b26c1324cc..7d05034d4b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Date; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java index 1ff534dc47..4e490b9743 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-2576. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java index 538c9b1f2d..7c16420732 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java index 22ad5a8f02..39988d30e5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java index 749bdd2ea9..9759a7e743 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-2605. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java index 707c6e79e8..fd7d1d32f3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java index 1add7ae30b..c1c68b7820 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.io.IOException; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java index fd0e6ebfaf..40a058c17e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java index 29b6f442d8..4c1c9baa0f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java index 55fb13b3e4..386a2dbc0a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java index 96ec04d846..198f038d04 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java index 8531b974cf..967da1f870 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java index a2ac8dd091..6353d8e4df 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java index d6dd1f837b..e1d597f7cb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-2744. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java index 57504f852a..49976cc53a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java index b6e1a443af..b35914914c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java index 0dac40812d..869ab9e4c2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java @@ -24,7 +24,8 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.io.FileUtils; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java index 37c6fff437..a6dbf2a553 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.io.FileUtils; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java index 009a4e3a5e..0430c08911 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java index 57ab2ad557..748d0dcc97 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java index e52571ed84..9c2e4938d7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java index 7102199745..c7d2e072a8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java index 4245ddbdd0..063012f59b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java index 08af2cdeb4..c325049ed7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java index 4dcd55c38e..17da026f8b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java index 30fc90eedd..c0eb714a1e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Collection; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java index a3f63bca7d..e5292814a7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-2926 diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java index 42c31820d2..533d7f4095 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java index a8690ca95d..9e47caf2c1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java index 9f5a18dd85..9061d4ac8c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java index 1f5bce071c..8fbe0e3b07 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java index dc331dbae4..b6704b8473 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java @@ -22,7 +22,9 @@ package org.apache.maven.it; import java.io.File; import java.util.List; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; /** * This is a test set for MNG-3023 diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java index ac8fecd66c..3556e708b0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java @@ -22,7 +22,9 @@ package org.apache.maven.it; import java.io.File; import java.io.IOException; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; /** * This is a test set for MNG-3038 diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java index b093476df0..5dfa4942b6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java index 55638dfdf6..57d3746bd3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3052. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java index fecf716d5d..bfa9c423df 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java index fa3c114ac5..c3b9340030 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java index 15782457aa..ef4aa9bb0a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java index 904e85cf5a..52131e7e59 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java index 4f50e4d194..caf35c9f10 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java index 915b8aee03..34a69c9a85 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Collections; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java index 9c87b426db..1196e280cb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Collections; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java index 2ea868bb9a..35a5dad4f2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3203. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java index 16036034de..b8734590c2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java index 10e9f5df2c..ca1a6baa2b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java index e5bdccd431..ee793d7d78 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java index 62c8624d5b..3b0fe70cfb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java index ef6fe78401..c17fcfb686 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java index 317c1cc159..03225f1f34 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3284: diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java index cc4c993242..3886922644 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java @@ -21,7 +21,9 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; /** * This is a test for MNG-3288. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java index 2355ec7d27..ea4e7ebc83 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java index d2443880eb..ce5a2970c5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java index 98f22c6323..eda2b732a1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3331. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java index a80895e1d5..588b358c63 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java index 79c57b24a1..01a0a5749f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java index a8fe710fe5..1cb02416d4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3379. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java index 68497bcea3..54bf15ad29 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java index a1a8988137..a1c9f13ac3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java index 2d230d3358..92f59d02d7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3396. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java index ef16476f7a..a9f953ac8e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3401. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java index c14852f6cc..0814c28bc5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.io.FileUtils; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java index f6cae68ea4..09e96d174b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java index a9e77f4330..80ccebf221 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.io.FileUtils; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java index 92781c2efd..84132c5807 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java index 54a1800ffb..df9202e869 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java index 90801ebc3c..bd3ab8ed38 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.io.IOException; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java index f03e850807..e59e4475bb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java index 641834effe..20c208fc8b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java index a74754ceb6..7a183645a5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java index 4a07b1f3cb..b616d884dd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java index b280766211..a4e39ed160 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.io.FileUtils; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java index 5c6695abd3..baf1c26557 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.io.IOException; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java index 105529f77a..d185e4414d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; @@ -52,7 +53,7 @@ public class MavenITmng3529QuotedCliArgTest verifier.setForkJvm( true ); // NOTE: We want to go through the launcher script verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); - verifier.addCliOption( "-Dtest.a=\" \"" ); + verifier.addCliOption( "-Dtest.a= " ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java index 0b53c0f459..7a55d87290 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java index 2b0b772be5..a4c1a7a153 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java index 3b3c8de807..d2144dc9e7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3545: diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java index 4eb0bd0d8e..c9e9eaef11 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java index e59687ffdc..8554a44732 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java index 982677db87..c0d59fb4f9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java index 4eb378331e..5cb96c95ba 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java @@ -23,7 +23,8 @@ import java.io.File; import java.io.IOException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.StringUtils; import org.apache.maven.shared.utils.io.FileUtils; import org.eclipse.jetty.server.Handler; @@ -184,7 +185,7 @@ public class MavenITmng3599useHttpProxyForWebDAVMk2Test verifier.resetStreams(); verifier.verifyArtifactPresent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" ); - verifier.assertArtifactContents( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar", + verifier.verifyArtifactContent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar", CONTENT ); } @@ -228,7 +229,7 @@ public class MavenITmng3599useHttpProxyForWebDAVMk2Test verifier.resetStreams(); verifier.verifyArtifactPresent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" ); - verifier.assertArtifactContents( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar", + verifier.verifyArtifactContent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar", CONTENT ); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java index c8dffd7a47..b850f71f54 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java index 090aaa7c53..316368987c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.net.URI; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java index f4518ef31f..c635103dc9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java index 51359f598a..e00a162396 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java @@ -23,7 +23,8 @@ import java.io.File; import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3641: diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java index 822f392d44..73e2bdac0e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3642. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java index eda57ab94a..cd98b3d2b6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java index 3642c927e1..759ed1bb57 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java index ff7b0c0b72..5781faabfa 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.List; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3667. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java index f2e33780e3..6ee24ff3e8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3671. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java index 1cb4787db5..677435b070 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3679: diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java index cd5f10692f..f05142e276 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.List; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3680. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java index 3990403878..5c21e1f529 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3684: diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java index e9e9f5de4c..bdd183e033 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.io.FileUtils; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java index e1f1261498..deeba80587 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3694: diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java index dfd10f5b6c..01bb7247a9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java index 00a3026522..20bc53e2f5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3703. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java index 0e4bc6940d..bffe8aca55 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.ArrayList; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java index 4b31f312b1..45f60203eb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java index 179a7d81f0..15f6d91923 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3716. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java index 91f28d44e6..8c4b94ea21 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java index 6152c277f0..d14b3e7b42 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3723. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java index ee5410f0ab..2e16fc8748 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3724. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java index 357452cc74..68d75ac1e5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3729. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java index 14c6624af8..58e7de371b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.ArrayList; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java index 1a9990e975..f08439ebc7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3740. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java index c18bd792b4..ef78910dc4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3746. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java index 119945d240..95479c7b14 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3747. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java index e86596eee1..63403d0521 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java @@ -22,7 +22,9 @@ package org.apache.maven.it; import java.io.File; import java.util.List; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; /** * This is a test set for MNG-3748. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java index 3ce9d1986f..aedc6fc5d0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java index 81674c67ca..b3294e891c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Collections; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java index 33979ef50f..14d66913cf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java index fb32f66096..1becae1436 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java index a4cd5420e3..a43cef3c85 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java index 65df2e663f..abc7755b5a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java index b6ad5bd5b8..7593f4bcb9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3808. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java index 46a1e820d9..0d9f21cb44 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3810. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java index 16ed98dea4..a4a69de9a4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java index 581fec9f60..17158e2b93 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java index 966157e472..760f0ac7e3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java index 5cc68ff9e2..613e3dd5ea 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java index 184fae24a3..a7a475719d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java index c7bf9a86f3..9a610ad283 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java index 082d7112af..7b2fc1ad87 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java index d50fcc785b..91c46d1dbd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java index 6628c1b54f..d7ceb63d60 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java index 8d9a40502c..8b07f37f17 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java index db65dd2d10..8326e40362 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java index da40502aa8..9feb9e0f00 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Collection; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java index 80f1c8ca1e..99e2f3663a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java index 67021096a8..6b408ee361 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java index 26b4420531..21be6f3a49 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java index 0f71bf9d2c..029f177e31 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java index 7256be9667..ee09bbbda6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java index f5830cff62..3f61362f19 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java index 4c9fcb68ea..a2cbf4f019 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java index e2b916ae12..79e72be3ba 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java index cb22b60ee4..ac43384976 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java index 2ce8200055..e0232721bf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.io.IOException; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java index 54b115ecf7..69be922b95 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java index 6934c61761..64c777fb01 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java index 19c8961220..161607a647 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java index aaa055690d..f9eeab60ce 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Locale; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.io.FileUtils; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java index 9ada61fcda..46b697ccee 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java index 40a1122e81..196b47b6e1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java index 7ddfa98e35..36a997deb5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java index 6a476f4336..d1a3e584b0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java index 13607b5699..ee7705ed69 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java index a31d9e44a1..a8f06a2db2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java index a13ac38ce3..8e3ba0b218 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java index 581e0623fe..fb5d280505 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java index e6b8a8f6be..84ddef7dd7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java index 27c0abb2f1..e64dd4bb8f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java index 218e70a0ba..cbd091b878 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.Os; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java index 8454fce561..abc2e9dac8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3941. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java index b8ddf0904e..d2709391bf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java index 9830925dd7..1839ac7f3a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java index 3b1c7577fc..0165dc33ab 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java index 0257175c69..49ea51b468 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java index 01bec8949e..cde2efe310 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java index b2013df09f..c0619abcea 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java index b5b6c40509..5d1f4bc594 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3955. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java index 6fb7ca1901..f58cc7d23d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java index e4acdd4522..35a0089cf9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java index cf3374294f..7cbe9211ec 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3979. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java index dd4d6cb82a..65bcaf3cf0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java index 24c6b90b5c..6968476c3c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java index fd8a8dfdcf..03beeca480 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java index 575d25aac9..e1e6ec8aa0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java index abbb87b71e..94a633d214 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java index 278e155782..35a7082d45 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java index 26ae4a1b7b..09b84543a3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java index 32a49b37d8..a3801a3fc9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java index 47c88c7662..ad0b2ee947 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java index b6f7006470..c83c3c39ff 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java index 019b8f6916..2a17a34f87 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java index 43da113787..68623a4a4e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java index 74f5314296..6fe768d4ff 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java index 88714e9c53..3ae6ac6e20 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java index bba040d1a2..7eb41930fb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java index 53fd658df6..64e291c61f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java index ae8a207454..0c3e3ab3c0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java index 7233fd3e7c..81dd6b53d3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java index 6991e495f6..b1057cfc74 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java index 90b1021ad7..a92a05b66a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java index 1f0dd7ae98..188d1ecaa4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Collections; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java index 39754fa2a3..42028e7213 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java index 91402fe475..996397c0db 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java index b4b8135d12..befc9cfc98 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java index 50b736780f..bd1cf5de27 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java index 61e1c1cc83..ad229bc90c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-4106. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java index 74d30f2030..4ed576b06f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-4107. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java index cf893db468..c1216b0533 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java index 0b1f70356f..aa79062fea 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-4116. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java index 81811511b0..e3ca6029ce 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java @@ -24,7 +24,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-4129. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java index 8068af2559..db2660dd7d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Collection; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java index d655458d10..bb036272b7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java index 2a29ffcf04..a4b981c336 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java index bcace821e6..9a878735bc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.ArrayList; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java index fdabeb4317..de9b79c82d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.ArrayList; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java index b076247d95..002e202a57 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-4189. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java index e8db236b68..4cea03f509 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.ArrayList; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java index f8e1f056c5..ad657ada06 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java index 0e91c02a5d..9a5795e692 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java index ff0476a756..40aef8339b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java index 42a456465b..838d0e115a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.ArrayList; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java index 651edbfe7f..ae3a5d4eb4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java index 58bd1c3590..5184cf4b47 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java index 67758aacc7..635ee69dfc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java index 83be45e00e..9087ad9d7a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java index e76736d393..e2c673fd65 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java index 8d78f2451e..d0f0a3593c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.it.utils.DeployedResource; import org.codehaus.plexus.util.StringUtils; import org.eclipse.jetty.security.ConstraintMapping; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java index d76ececb64..7863314d51 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.io.IOException; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java index f5bfee9829..5a9f97c2b1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java index 5bd96b0368..971d6ec78a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-4262. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java index 4d40ec9d8e..5719c169e6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java index 5423cb9550..c11d164251 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.io.IOException; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java index d8be4f5462..4bd0536ea9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java index d027d866c0..1e3d4f6eb7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java index 974d192f69..24948db06e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java index 75c904aa30..c5bc9a9f72 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java index 04fc93e4c7..3d3daa3dc7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java index 2f553a13e8..05eac6dcb8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java index 19a0939815..ca51ff2deb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java index 7a1eb77f7f..da0805f248 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java index 0626797520..c27e1b353c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java index ae2d7abb3b..6727cbe8b8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java index c6d6d3a2fa..3569da9ab7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java index 43cb67cfe0..b66b0de9c7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java @@ -21,7 +21,9 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import org.apache.maven.shared.utils.io.FileUtils; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java index 188015e555..9431f520e0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java index 989c041224..64c363c4bc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java index e6c107737d..f7ec27195d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java index 91c79ae48c..1410cd9845 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java index 6e38c171ae..7907500677 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java index 9f3cb1e69d..6a8165f2d5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java index c3a4047c31..f1a0941b30 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java index 43fed13f2c..eda334b772 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java index d203fefa4f..f381a912ee 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java index a02d457c18..65b57b3b29 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java index 18855fe57a..43fe16b88b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java index e79968666d..f35cedc2bc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java index 02e7b56ce8..1b1a851ccf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java index 70cea39cee..43c298ce42 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java index fd553af374..66fd13b056 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java index 9fa058fd55..51afbae065 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java index 6aa888d064..7714fef120 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.io.IOException; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java index 9ee1b869d3..c09093cc84 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java index 6357e86062..c4de723357 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java index a83593a8b9..1fe8b49210 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java index 5df7689b9e..0c335fc05a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java index 0b72b402cc..aa2dbecb3d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java index 4a0fc3a519..5c77a7bdb6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java index b7f48ae1e3..c11bd428a5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java index 39688d9bfe..8bc1ba8d92 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java index d5cb132cb3..ca55e9f9dc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java index 52e55b2f8a..330c14f456 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java index e12e3c9c37..3967b504a5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java index 77fed1f463..9b4a2e8aac 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java index 0edc17cba8..291a1e517f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java index 1d1ae2b243..ca12781330 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java index c7789695d2..625ca01a13 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java index 338fbaf4e7..8e89d8894a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java index 24d5625f72..b83c388cde 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.io.FileUtils; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java index 196ca39a78..a8a23d08f9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Collections; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java index 7d267027e4..85a0e25c5a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java index 02ffe7305d..c576e320af 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java index d989c1e714..42871eaa97 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java index 5eca943f51..4beb36e383 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java index 300dcb68f8..d23d81e24f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Collections; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java index 4b9fc4b145..08f958ad45 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java index 9e43cf2e49..15da5121c6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java index 99f283d8d3..6c8ab72c89 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java index eeb45bd21b..83af31ddde 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java index 9c3bb15b31..b4361b717b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java index f7a20f10b8..7aaea14c70 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.ArrayList; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java index e079c31304..140531a83d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java index d71fa66247..2b0896e694 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java index e5edbbdb6f..b11ce1fb93 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java index 1966384574..458c09b04a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java index 1dfca322f6..8000b00751 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-4411. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java index 07bdee3c3e..afa58d4e3a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java index 75a7a24634..eff4b19042 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java index 16411f8c1e..0ae84b6c5e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.ArrayList; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java index 169c0ec87f..cf628b4667 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.ArrayList; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java index ad01376c71..222dc321b5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java index 01c5e2cf30..38514cde1a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java index bf92d351ef..17547d5e0b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java index bc8c030bb6..0855041b9f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java index 9b75a06867..9f7acb4ef0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java index 65c6a28503..2ec8b312e8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java index 97ff5bcd7f..a1f542cb56 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java index bebc74d5be..735fa5e460 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java index 8f0ecaee0b..edd7b0ecf9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java index 18c7c0e471..a86f39a670 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java index 49bf081103..7df8b87ba8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java index 5fb0c4ca2a..fc2fb2f250 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java index 59427790d7..f58d7a79e1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java index 1493d43502..2626160e5b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java @@ -21,7 +21,9 @@ package org.apache.maven.it; import java.io.File; import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; /** * Integration tests for MNG-4463. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java index aa8f23c23d..32966641f8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java index ac327c92e9..fccadfa54f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Collections; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-4465. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java index 8344cf0b93..bb02a84608 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java index d6dac2b4ea..072575eec5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.it.utils.DeployedResource; import org.codehaus.plexus.util.StringUtils; import org.eclipse.jetty.security.ConstraintMapping; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java index bbf12cc307..db6628f556 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java index cb1a8b5bff..04eb3e4686 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-4479. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java index 787ccf76ca..8b2a08ae0c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java index 41bc67a918..40c881c031 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java index 10adac2c79..e2a40a3c5a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java index 82f5abcff1..ae969ad207 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java index 852688d0f1..698ea032a4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java index f7cec4c896..597c1a498b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java index d22c7050af..3382d2035f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java index 7dac042754..2eb32e49ca 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java index 979a7ec978..d431830c8f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java index a64b01dd37..6ddd8d1a0e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java index c3a249c075..0a3d4d3645 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java index 77009702a6..8cb35ad7a7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.io.FileUtils; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java index 26cba54af7..f625873faa 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java index 0bad164797..9decdd9d7d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java index 4b7c46cc03..721d622ac2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-3106: diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java index b4accea394..7507deaf70 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java index 7858b081ba..94554e224a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java index f53f3fd4d6..778ef9d707 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java index bad2d0232b..485402fe2d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java index e4f9d4de0d..4ec17d0e7c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java index 08b7edd580..b2ab53fd55 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java index 0d40c025da..c8c1fc3b9a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java index 514e74b4ce..c44ca15a91 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.codehaus.plexus.util.Os; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java index 530624d5eb..7f5b02e669 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java index 9c4e0dd0b2..2c08df336d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java @@ -1,6 +1,7 @@ package org.apache.maven.it; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java index a1bbec8e57..ef6fc3d33e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java index 9af887b9c8..a6297690e6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java index 7f76bf38d4..bb8305aa62 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import org.apache.maven.shared.utils.io.FileUtils; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java index 8ba0920b8d..9ed304965a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java index fe273fd12f..e67304f1b4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.ArrayList; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java index ad94fdc3a4..9a1142490a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java index 1a1cc50652..5f7b4f3b2a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java index 2ba1b60a43..97f09dd901 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java index 5e431bd170..b5e734f2d5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java index 58f831ac37..fa1864fe01 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.HashSet; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java index d65a0059e3..df177b43d2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java index c46d725d61..e84405c48d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java index dc5e5fc239..0855520d58 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java index 20522af73c..a79dd0da18 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.io.FileUtils; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java index 82bd35162b..6869eaf121 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java index 0994919d17..04ff0282e6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java index 62d188e216..9e29e2dadc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java index 164d0ca19a..6da42dca8c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java index 41b88b7ba9..02b7fba6a8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java index d81ac6b693..ceb177c5af 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java index 5ae828a23d..a8fb6dd411 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java index 63bb5c116a..5ebe70d070 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java index 200f97c3b1..eada5e7665 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java index 7e6d9aa4c5..da3f3bf6c4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java index 3385a1612c..0b261e116c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java index 2e759084de..e2640f34f1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java index b6ee917b17..8eb8c5d369 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java index c8150697cb..a24be2d4c2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java index 2bc636d8d9..c5bec9a134 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java index 8354f69b25..5920358534 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java index 5f3b39fdca..fd09bfd4cc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java index dc6dc03df6..544c2305b1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java index 5d8d8723c4..efdd9c0bef 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java index ed1e696278..8e277a9a56 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.ArrayList; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java index 6c7e1c04fa..85ec19d605 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java index b3de1823c7..b1c2a27374 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java index 42eb33aaf6..c899e9574f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java index 9def563fe4..5e3e821971 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java index 5bc87e0ca6..dd31101c7c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java index ded1855cdf..00a5ba9139 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.io.FileUtils; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java index 41f17c1d84..3011ac675c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java index f753bbfb6e..27a71bc44f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java index 0b5f08f028..3ed7557996 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java index e3dec47117..0aeeaf8f41 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java index 33367aefb8..ff8c11432c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java index f7edc05e11..e2a128c4b2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java index 77dfcc49f4..9bf009eca0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java index 99b3e97e41..255fd04f99 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java index 0a8ad3ba72..a116eba320 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java index 3ddeb4f668..fe69133a94 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.io.FileUtils; /** diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java index 6e54f2595c..7ca9ec7931 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java index 553090ed29..cad886cc16 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java index 6a7d7c7343..a4bed9f85a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java index 1a8a986f36..2748ac58f6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java index 68f80ce2ff..837e9a62fb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java index 28dfea74c8..0fb290635a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java index 25a2e45067..f36aa79274 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java index 1e40595227..b61ddea132 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java index c46372f6d1..4daf0a66bb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java index 53a4627c56..4e3bcc90d4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java index a809f1f92e..baaf795d72 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java index 3fe16e59bc..420fa2acac 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.java index f45f20ed6a..8c38b41746 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java index 54c6eea410..14635f92d0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java index 6983f44c8d..d3ae23719c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java index 030a2b3e86..2622356f6f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java index 896b16bb80..5e5d8f1c74 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java index ce44fa16ab..d1f5ea3e8c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java index f037b7a893..4638be3ea0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java index b4c4a47b49..9257d8de9d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java index fc5c959091..5ce5fb9b61 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java index 4e2d0bf38d..2814f7b542 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java index 4f9bf5c41b..239aca886a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java @@ -20,7 +20,8 @@ package org.apache.maven.it; */ import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; public class MavenITmng5208EventSpyParallelTest extends AbstractMavenIntegrationTestCase diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java index d45c9b3ecc..62d6fcb322 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java index 5f6ff86a7f..7ebfa9529f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java @@ -25,7 +25,8 @@ import java.util.List; import java.util.Properties; import java.util.regex.Pattern; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * Test for diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java index b40f0d0250..d5e9e47a16 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java index fe58ba1d1c..6395292685 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java index 220cf73054..a62456d310 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java index 33abb0d2b7..5ea8291328 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java index bc698aacbf..48142b100d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java index ac546e00b2..f7ae1055e7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.io.FileUtils; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java index 5c32609e22..e323d842cf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; public class MavenITmng5389LifecycleParticipantAfterSessionEnd extends AbstractMavenIntegrationTestCase diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java index cc965caa04..7b4058ae35 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java index f964fc1803..7fdb4abb9c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-5445. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java index 0361d779a2..7156b48f7b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java index a429441514..fd4663c0c7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.io.IOException; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java index 14f9fbc36f..2f764ab1b3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java index 5370c8bf10..6e0ae192ba 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; public class MavenITmng5530MojoExecutionScopeTest extends AbstractMavenIntegrationTestCase diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java index 4d09ee3948..8614dc10e7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java @@ -21,7 +21,9 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; /** * Test to make sure that the reactor is properly constrained when --projects is used. Previous to 3.1.2 all of the diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java index 5832260770..1970fa1c89 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; public class MavenITmng5561PluginRelocationLosesConfigurationTest extends AbstractMavenIntegrationTestCase diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java index d50c689592..47949700d8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java index 5d33715201..f0291f196e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java index 486a01910a..0416498ec0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; public class MavenITmng5578SessionScopeTest extends AbstractMavenIntegrationTestCase diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java index 68adbae331..382fd621e1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java @@ -22,7 +22,9 @@ package org.apache.maven.it; import java.io.File; import java.util.List; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; public class MavenITmng5581LifecycleMappingDelegate extends AbstractMavenIntegrationTestCase @@ -50,18 +52,21 @@ public class MavenITmng5581LifecycleMappingDelegate Verifier verifier; // install the test extension - verifier = newVerifier( extensionDir.getAbsolutePath(), "remote" ); + verifier = newVerifier( extensionDir.getAbsolutePath() ); verifier.executeGoal( "install" ); verifier.resetStreams(); verifier.verifyErrorFreeLog(); // compile the test project - verifier = newVerifier( projectDir.getAbsolutePath(), "remote" ); + verifier = newVerifier( projectDir.getAbsolutePath() ); + verifier.setLogFileName( "compile-log.txt" ); verifier.executeGoal( "compile" ); verifier.resetStreams(); verifier.verifyErrorFreeLog(); // run custom "test-only" build phase + verifier = newVerifier( projectDir.getAbsolutePath() ); + verifier.setLogFileName( "test-only-log.txt" ); verifier.setForkJvm( true ); verifier.setMavenDebug( true ); verifier.executeGoal( "test-only" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java index 2d3cc3a142..9f484a9b24 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; public class MavenITmng5591WorkspaceReader extends AbstractMavenIntegrationTestCase diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java index cf91866a5f..77edf467b8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java index 2734040e71..7a126c9173 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java index 5a94984825..81a30eabfe 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java @@ -21,7 +21,9 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; /** * IT that verifies that lifecycle participant diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java index 3faef8c751..b420ebaa8f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java index cbcd46c035..a1aeace97e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java @@ -27,7 +27,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * An integration test to ensure any pomfile is only read once. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java index ec95213f16..174ba68bd5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Properties; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java index 3b3c901cf8..29da9b139c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.io.FileUtils; public class MavenITmng5742BuildExtensionClassloaderTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java index b0f38422d3..1226f3d4d1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.io.FileUtils; public class MavenITmng5753CustomMojoExecutionConfiguratorTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java index 35596c8e1b..aca4fed92a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.io.IOException; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java index b64d1fdef3..e5f6db3611 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; public class MavenITmng5768CliExecutionIdTest extends AbstractMavenIntegrationTestCase diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java index 17339cc189..3db57040b4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java @@ -3,7 +3,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-5771: diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java index 2278bc9c13..1ea4c230ce 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java @@ -3,7 +3,9 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; public class MavenITmng5774ConfigurationProcessorsTest extends AbstractMavenIntegrationTestCase diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java index 8d95a29626..e574c95f4c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java @@ -3,7 +3,8 @@ package org.apache.maven.it; import java.io.File; import java.util.List; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; public class MavenITmng5783PluginDependencyFiltering extends AbstractMavenIntegrationTestCase diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java index 9d9a393e81..4d301606a7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java @@ -2,7 +2,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; public class MavenITmng5805PkgTypeMojoConfiguration2 extends AbstractMavenIntegrationTestCase diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java index bee5b139dc..be3a39b010 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java @@ -1,6 +1,7 @@ package org.apache.maven.it; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java index f33297ddde..10154c9aef 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java @@ -1,6 +1,7 @@ package org.apache.maven.it; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java index f87b2d503b..d7572dd545 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java index 7eef976334..5d7c79dcb5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-5889: diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java index 20cb92660c..22e96344f0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java index 086e21766b..ad6144f04c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java index 054a307e8f..f1265f0e60 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.List; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-5935. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java index bb22f70386..bc3ef0ec48 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java @@ -2,7 +2,9 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; public class MavenITmng5958LifecyclePhaseBinaryCompat extends AbstractMavenIntegrationTestCase diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java index 47c5ba817d..c7a40ed5f4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java @@ -7,7 +7,9 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; /** * Test set for MNG-5965. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java index 674ac76959..343a5347a2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.LinkedList; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6065FailOnSeverityTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6065FailOnSeverityTest.java index bf861a2c7f..ecbe2eac65 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6065FailOnSeverityTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6065FailOnSeverityTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java index 90052b6d99..aaddbdb210 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java @@ -1,6 +1,7 @@ package org.apache.maven.it; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.junit.Test; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java index 1096eca801..2cd86472ce 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java index 4a9525746b..20c8910f66 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java index 4e4b6bf9e9..5c7f293edf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.io.IOException; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a collection of test cases for MNG-6118, diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java index 5d2638366e..7b3231d3ca 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.io.FileUtils; public class MavenITmng6127PluginExecutionConfigurationInterferenceTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java index ef56303fe3..1a776b6606 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.*; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java index 29b9208d96..a45a4ffc05 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.*; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java index 87656ab36a..0048dbedc0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java index e28f5f35e5..8063b448a0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-6210: diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java index 063794fecb..93d4058bd0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.List; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-6240. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java index f2aeb8b699..93d4d3d172 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import com.google.common.base.Charsets; import com.google.common.base.Joiner; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java index 1cb77fa34a..d21b253cd0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-6256: check that directories diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java index 01eebcd3d3..ab93909ac5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java @@ -25,7 +25,9 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; /** * This is a test set for MNG-6326: diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java index 7faa412c89..fca88f52f0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java @@ -24,7 +24,9 @@ import static org.hamcrest.CoreMatchers.containsString; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; /** * MNG-6030 reintroduced ReactorModelCache, but this ignores invalid relativePaths of parents diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java index a1db736187..060f6694c3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java @@ -22,7 +22,8 @@ package org.apache.maven.it; import java.io.File; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.Os; import static org.hamcrest.CoreMatchers.anyOf; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java index 828351c78a..1832eac065 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java index a7a4a99c6b..5fba9cc677 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; public class MavenITmng6506PackageAnnotationTest extends AbstractMavenIntegrationTestCase diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java index c0a141460e..332328243e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.io.IOException; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java index c93817f717..635d1e6dda 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java index 5f1d6d33b1..dc184cd1fe 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java index 801bd785a8..32b228e597 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java index ce2c18f2e8..959a136921 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.io.FileUtils; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java index fb0ca2678d..53c9df21e1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.util.Arrays; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java index aa85784ed0..f073118baa 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java @@ -29,7 +29,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.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java index f407f1fc06..40fe2eac08 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; import java.net.URI; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test for MNG-6759. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java index 76a7451ab9..09d2667d84 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java @@ -40,7 +40,8 @@ import java.io.File; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-6772: diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java index 2fd38127a2..2eb01e74e5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.utils.io.FileUtils; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java index 3b95466149..5e5aecb8bf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test for MNG-6972. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java index a2ce8441f2..92bb820a2a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.util.List; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java index 1d62a6171c..576ac40380 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java @@ -22,7 +22,9 @@ package org.apache.maven.it; import java.io.File; import java.io.IOException; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import org.junit.Test; public class MavenITmng7045DropUselessAndOutdatedCdiApiTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java index 6d1cbb8cc8..fa79db7a8a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java index dbf313c3ea..6ba7f7a00e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java @@ -25,7 +25,9 @@ import java.io.IOException; import java.io.Reader; import java.util.Properties; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; public class MavenITmng7110ExtensionClassloader extends AbstractMavenIntegrationTestCase diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java index 87519c8656..997f257c69 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.io.IOException; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java index c10cfb64e2..6f6e171fbf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java index 4fd82a3822..54fac7c34a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java @@ -22,7 +22,9 @@ package org.apache.maven.it; import java.io.File; import java.io.IOException; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; public class MavenITmng7160ExtensionClassloader extends AbstractMavenIntegrationTestCase diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java index a523eb47b0..0c2343e1c5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java @@ -18,7 +18,9 @@ */ package org.apache.maven.it; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.io.IOException; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java index 158ae84916..5bd90d4e1d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java @@ -19,7 +19,8 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java index d7d6c65b25..18ae63754c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java @@ -23,7 +23,9 @@ import java.io.File; import java.io.IOException; import java.util.Arrays; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; public class MavenITmng7335MissingJarInParallelBuild extends AbstractMavenIntegrationTestCase diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7349RelocationWarningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7349RelocationWarningTest.java index 62e2da4257..72dbf343b9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7349RelocationWarningTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7349RelocationWarningTest.java @@ -23,7 +23,8 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; public class MavenITmng7349RelocationWarningTest extends AbstractMavenIntegrationTestCase diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7353CliGoalInvocationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7353CliGoalInvocationTest.java index d5607eddf1..eb8c71969b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7353CliGoalInvocationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7353CliGoalInvocationTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * Tests new mvn prefix:version:goal, diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7360BuildConsumer.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7360BuildConsumer.java index dcb5ffdeaf..08f1435997 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7360BuildConsumer.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7360BuildConsumer.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This test suite tests whether the consumer pom feature can load a project with a {@code parent} tag diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java index 6dc9769f86..995d5b1e2b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java index d9f3e49f0f..6daf5cb3b9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java @@ -18,7 +18,9 @@ */ package org.apache.maven.it; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import java.io.File; import java.io.IOException; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java index 68679cf515..91f17698dc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java @@ -19,7 +19,9 @@ package org.apache.maven.it; * under the License. */ -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; import org.junit.Assert; import java.io.File; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java index 179d388df2..613957b6f6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java @@ -24,7 +24,8 @@ import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * Test for diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java index 57e63b38d8..81c67007c7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java @@ -24,7 +24,8 @@ import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * Test for diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java index 1e7a7e014c..6b71f600e1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java @@ -4,7 +4,8 @@ import java.io.File; import java.util.HashMap; import java.util.Map; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-7470: diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java index 7619a30288..8cb4ab1217 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java @@ -21,7 +21,8 @@ package org.apache.maven.it; import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-7474: diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java index 59b8c861a2..75dadcd9d1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java @@ -21,7 +21,9 @@ package org.apache.maven.it; import java.io.File; import java.io.IOException; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; public class MavenITmng7487DeadlockTest extends AbstractMavenIntegrationTestCase { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java index 878d924771..95eaffc5bc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java @@ -22,7 +22,9 @@ import java.io.File; import java.io.IOException; import java.util.List; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; /** * Test for diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java index 51149a8ce9..628c24d32f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java @@ -20,7 +20,8 @@ package org.apache.maven.it; */ import java.io.File; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; /** * This is a test set for MNG-7529. diff --git a/its/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/basic/pom.xml b/its/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/basic/pom.xml index 26b3d6a595..56c040b893 100644 --- a/its/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/basic/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/basic/pom.xml @@ -45,9 +45,9 @@ under the License. - + maven-compiler-plugin - 3.1 + 3.10.1 diff --git a/its/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/pom.xml b/its/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/pom.xml index 8426183ab6..c8a4a6d25d 100644 --- a/its/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/pom.xml @@ -27,15 +27,11 @@ under the License. mng-5581-lifecycle-mapping-delegate-extension 0.1 - - 3.2.1 - - org.apache.maven maven-core - ${maven.version} + 3.2.5 provided diff --git a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java index e1e4df43c0..0f873f058c 100644 --- a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java +++ b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java @@ -35,6 +35,9 @@ import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException import org.apache.maven.artifact.versioning.VersionRange; import org.apache.maven.shared.utils.io.FileUtils; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + /** * @author Jason van Zyl * @author Kenney Westerhof diff --git a/its/core-it-support/maven-it-sample/src/test/java/org/apache/maven/it/MavenITmngXXXXDescriptionOfProblemTest.java b/its/core-it-support/maven-it-sample/src/test/java/org/apache/maven/it/MavenITmngXXXXDescriptionOfProblemTest.java index b4e1079d36..01355ef993 100644 --- a/its/core-it-support/maven-it-sample/src/test/java/org/apache/maven/it/MavenITmngXXXXDescriptionOfProblemTest.java +++ b/its/core-it-support/maven-it-sample/src/test/java/org/apache/maven/it/MavenITmngXXXXDescriptionOfProblemTest.java @@ -24,7 +24,9 @@ import java.util.ArrayList; import java.util.List; import org.apache.maven.it.Verifier; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; /** * This is a sample integration test. The IT tests typically diff --git a/its/pom.xml b/its/pom.xml index 94da152362..78d7401caa 100644 --- a/its/pom.xml +++ b/its/pom.xml @@ -82,7 +82,7 @@ under the License. org.apache.maven.shared maven-verifier - 1.8.0 + 2.0.0-M1